修改物料新增判断是原片还是辅料条件

廖井涛

2025-04-02 ed50f0d342269d1124e7db56f5d69bc1ac1809d8

修改物料新增判断是原片还是辅料条件

 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue

@@ -646,17 +646,28 @@
            ElMessage.error("请输入库存区域")
            return
          }*/
          let  flowData
          if(selectRecords.height===undefined){
              flowData = ref({

              title: titleUploadData.value,
              materialCode: selectRecords.id,
              userName:userStore.user.userName,
              userId:userStore.user.userId

          let  flowData = ref({
            totalArea: parseFloat(divideAuto(multiply(selectRecords.height,selectRecords.width),1000000,2))*titleUploadData.value.inventoryQuantity,
            singlePieceArea: parseFloat(divideAuto(multiply(selectRecords.height,selectRecords.width),1000000,2)),
            title: titleUploadData.value,
            materialCode: selectRecords.id,
            userName:userStore.user.userName,
            userId:userStore.user.userId
            })
          }else{
              flowData = ref({
                totalArea: parseFloat(divideAuto(multiply(selectRecords.height,selectRecords.width),1000000,2))*titleUploadData.value.inventoryQuantity,
                singlePieceArea: parseFloat(divideAuto(multiply(selectRecords.height,selectRecords.width),1000000,2)),
              title: titleUploadData.value,
              materialCode: selectRecords.id,
              userName:userStore.user.userName,
              userId:userStore.user.userId

          })
            })
          }

          console.log(flowData.value)

          request.post("/materialInventory/saveMaterialInventory", flowData.value).then((res) => {

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

@@ -1030,6 +1030,7 @@
            Log log = new Log();
            log.setOperatorId(object.get("userId").toString());
            log.setOperator(object.get("userName").toString());
            log.setFunction("cancelMaterialAdditionRecord物料新增撤销");
            log.setContent(object.toString());
            //获取对象集合循环进行新增修改
            List<MaterialLog> materialLoglist = JSONArray.parseArray(JSONObject.toJSONString(object.get("materialAdd")), MaterialLog.class);