修改物料资料新增删除校验

廖井涛

2024-08-19 100ac0e5da3cf6e118e17c176166b59c8518da58

修改物料资料新增删除校验

 north-glass-erp/northglass-erp/src/views/mm/mainIngredient/CreateIngredients.vue

@@ -120,9 +120,11 @@

  if(isBool){
    request.post("/MaterialStore/saveMaterialStore", materialStore).then((res) => {
      if(res.code==200 && res.data===true){
      if(res.code==200 && res.data==="true"){
        resetForm()
        ElMessage.success(t('basicData.msg.saveSuccess'))
      }else if(res.data==="false1"){
        ElMessage.warning("该物料已存在")
      }else{
        ElMessage.warning(t('basicData.msg.saveFail'))
      }

 north-glass-erp/northglass-erp/src/views/mm/mainIngredient/SelectIngredients.vue

@@ -26,9 +26,11 @@
        id: row.id
      })
      request.post("/MaterialStore/deleteMaterialStore",flowData.value).then((res) => {
        if(res.code==200 && res.data===true){
        if(res.code==200 && res.data==="true"){
          ElMessage.success(t('basicData.msg.deleteSuccess'))
          router.push({path:'/main/ingredients/SelectIngredients',query:{random:Math.random()}})
        }else if(res.data==="false1"){
          ElMessage.warning("库存已存在此物料不能删除")
        }else{
          ElMessage.warning(t('basicData.msg.deleteFail'))
        }

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue

@@ -132,12 +132,15 @@
    </div>-->
    <div id="entirety" v-for="(item,id) in labelList" >
        <div class="row1">

          <div style="position: absolute;font-weight: bold;margin-left: 5px;" v-if="item.heat_layout_id!=null">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>
          <span>{{ item.customer_name }}</span>&nbsp;
          <span>{{ item.order_id }}</span>&nbsp;
          <span v-if="item.process.includes('夹胶')">胶片</span>
          <span v-else-if="item.process.includes('中空')">中空</span>
          <span v-else-if="item.process.includes('百叶')">百叶</span>
          <span v-else></span>

        </div>

        <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>

 north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialStoreMapper.java

@@ -31,4 +31,8 @@

    Boolean deleteMaterialStore(@Param("id") Long id);

    Integer selectMaterialStore(@Param("id") Long id);

    Integer selectMaterialStoreJson(@Param("json") String json);

}

 north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java

@@ -28,8 +28,8 @@
    @Autowired
    SysErrorService sysErrorService;

    public Boolean saveMaterialStore(Map<String,Object> object) {
        boolean saveState = true;
    public String saveMaterialStore(Map<String,Object> object) {
        String saveState = "true";
        //设置回滚点
        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
        try {
@@ -56,14 +56,20 @@
            }
            DecimalFormat decimalFormat = new DecimalFormat("#0.00");
            singlePieceArea= Double.parseDouble(decimalFormat.format(width * height / 100000));
            if(Long.parseLong(id)>0){
                materialStoreMapper.updateMaterialStore(type,json, Long.valueOf(id));
                if (Objects.equals(type, "原片")){
                    materialInventoryMapper.updateMaterialInventoryArea(Long.valueOf(id),singlePieceArea);
            Integer jsonCount=materialStoreMapper.selectMaterialStoreJson(json);
            if(jsonCount==0){
                if(Long.parseLong(id)>0){
                    materialStoreMapper.updateMaterialStore(type,json, Long.valueOf(id));
                    if (Objects.equals(type, "原片")){
                        materialInventoryMapper.updateMaterialInventoryArea(Long.valueOf(id),singlePieceArea);
                    }
                }else{
                    materialStoreMapper.insertMaterialStore(type,json);
                }
            }else{
                materialStoreMapper.insertMaterialStore(type,json);
                saveState = "false1";
            }

        } catch (Exception e) {
            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
            //将异常传入数据库
@@ -71,7 +77,7 @@
            sysError.setError(e+Arrays.toString(e.getStackTrace()));
            sysError.setFunc("saveMaterialStore");
            sysErrorService.insert(sysError);
            saveState = false;
            saveState = "false";

        }
        return saveState;
@@ -87,8 +93,8 @@
        return map;
    }

    public Boolean deleteMaterialStore(Map<String,Object> object) {
        boolean saveState = true;
    public String deleteMaterialStore(Map<String,Object> object) {
        String saveState = "true";
        //设置回滚点
        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
        try {
@@ -97,7 +103,13 @@
                id = object.get("id").toString();
            }
            if(id!=null){
                materialStoreMapper.deleteMaterialStore(Long.valueOf(id));
                Integer materialCount=materialStoreMapper.selectMaterialStore(Long.valueOf(id));
                if(materialCount==0){
                    materialStoreMapper.deleteMaterialStore(Long.valueOf(id));
                }else{
                    saveState="false1";
                }

            }


@@ -109,7 +121,7 @@
            sysError.setError(e+Arrays.toString(e.getStackTrace()));
            sysError.setFunc("deleteMaterialStore");
            sysErrorService.insert(sysError);
            saveState = false;
            saveState = "false";

        }
        return saveState;

 north-glass-erp/src/main/resources/mapper/mm/MaterialStore.xml

@@ -57,6 +57,14 @@
        delete from mm.material_store where id=#{id}
    </delete>

    <select id="selectMaterialStore" >
        select count(*) from mm.material_inventory where material_code=#{id}
    </select>

    <select id="selectMaterialStoreJson" >
        select count(*) from mm.material_store where json=#{json}
    </select>