1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/QualityInspectionManagement.java

@@ -47,6 +47,10 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      * 关联id
      */
     private String relationId;
+    /**
+     * 出入库记录id
+     */
+    private String warehouseInOutId;
     /**
      * 类型
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WeighingManagement.java

@@ -44,6 +44,10 @@ public class WeighingManagement extends BaseModel<WeighingManagement> {
      * 关联id
      */
     private String relationId;
+    /**
+     * 出入库记录id
+     */
+    private String warehouseInOutId;
     /**
      * 类型
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PaymentManagementServiceImpl.java

@@ -314,34 +314,40 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
                 .eq("relation_id", paymentManagement1.getRelationId())
                 .eq("comp_id", paymentManagement1.getCompId()));
-        WarehouseInOutInfo warehouseInOutInfo1 = new WarehouseInOutInfo();
-        WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
-                .eq("warehouse_name", paymentManagement1.getWarehouseName())
-                .eq("comp_id", qualityInspectionManagement.getCompId()));
-        //生成流转信息
-        warehouseInOutInfo1.setId(IdGenerator.generateUUID());
-        warehouseInOutInfo1.setPaymentId(paymentManagement.getId());
-        warehouseInOutInfo1.setWarehouseName(paymentManagement1.getWarehouseName());
-        warehouseInOutInfo1.setGrossWeight(paymentManagement1.getGrossWeight() / 1000);
-        warehouseInOutInfo1.setTare(paymentManagement1.getTare() / 1000);
-        warehouseInOutInfo1.setBaseId(warehouseBaseInfo.getId());
-        //查到仓位编号
-        WarehousePositionInfo warehousePositionInfo = warehousePositionInfoService.selectOne(new EntityWrapper<WarehousePositionInfo>()
-                .eq("base_id", warehouseBaseInfo.getId())
-                .eq("bin_number", qualityInspectionManagement.getBinNumber()));
-        warehouseInOutInfo1.setPositionId(warehousePositionInfo.getId());
-        warehouseInOutInfo1.setBinNumber(qualityInspectionManagement.getBinNumber());
-        warehouseInOutInfo1.setGoodsName(paymentManagement1.getGoodsName());
-        CommonSysParameter commonSysParameter = iCommonSysParameterService.selectOne(new EntityWrapper<CommonSysParameter>().eq("const_id", "CON2").eq("const_value", paymentManagement1.getGoodsName()));
-        warehouseInOutInfo1.setGoodsNameKey(commonSysParameter.getConstKey());
-        warehouseInOutInfo1.setInOutType("收购入库");
-        warehouseInOutInfo1.setInOutFlag("2");
-        warehouseInOutInfo1.setCarNo(paymentManagement1.getCarNo());
-        warehouseInOutInfo1.setContractNo(paymentManagement1.getPaymentNo());
-        warehouseInOutInfo1.setAgent(paymentManagement.getSettlementClerk());
-        warehouseInOutInfo1.setInOutDate(new Date());
-        warehouseInOutInfo1.setGrade(qualityInspectionManagement.getGrade());
-        //潮粮取纯重，干粮取净重
+        WarehouseInOutInfo warehouseInOutInfo=warehouseInOutInfoService.selectById(qualityInspectionManagement.getWarehouseInOutId());
+        if (warehouseInOutInfo!=null){
+            warehouseInOutInfo.setPaymentId(paymentManagement.getId());
+            warehouseInOutInfoService.updateById(warehouseInOutInfo);
+        }
+        else{
+            WarehouseInOutInfo warehouseInOutInfo1 = new WarehouseInOutInfo();
+            WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
+                    .eq("warehouse_name", paymentManagement1.getWarehouseName())
+                    .eq("comp_id", qualityInspectionManagement.getCompId()));
+            //生成流转信息
+            warehouseInOutInfo1.setId(IdGenerator.generateUUID());
+            warehouseInOutInfo1.setPaymentId(paymentManagement.getId());
+            warehouseInOutInfo1.setWarehouseName(paymentManagement1.getWarehouseName());
+            warehouseInOutInfo1.setGrossWeight(paymentManagement1.getGrossWeight() / 1000);
+            warehouseInOutInfo1.setTare(paymentManagement1.getTare() / 1000);
+            warehouseInOutInfo1.setBaseId(warehouseBaseInfo.getId());
+            //查到仓位编号
+            WarehousePositionInfo warehousePositionInfo = warehousePositionInfoService.selectOne(new EntityWrapper<WarehousePositionInfo>()
+                    .eq("base_id", warehouseBaseInfo.getId())
+                    .eq("bin_number", qualityInspectionManagement.getBinNumber()));
+            warehouseInOutInfo1.setPositionId(warehousePositionInfo.getId());
+            warehouseInOutInfo1.setBinNumber(qualityInspectionManagement.getBinNumber());
+            warehouseInOutInfo1.setGoodsName(paymentManagement1.getGoodsName());
+            CommonSysParameter commonSysParameter = iCommonSysParameterService.selectOne(new EntityWrapper<CommonSysParameter>().eq("const_id", "CON2").eq("const_value", paymentManagement1.getGoodsName()));
+            warehouseInOutInfo1.setGoodsNameKey(commonSysParameter.getConstKey());
+            warehouseInOutInfo1.setInOutType("收购入库");
+            warehouseInOutInfo1.setInOutFlag("2");
+            warehouseInOutInfo1.setCarNo(paymentManagement1.getCarNo());
+            warehouseInOutInfo1.setContractNo(paymentManagement1.getPaymentNo());
+            warehouseInOutInfo1.setAgent(paymentManagement.getSettlementClerk());
+            warehouseInOutInfo1.setInOutDate(new Date());
+            warehouseInOutInfo1.setGrade(qualityInspectionManagement.getGrade());
+            //潮粮取纯重，干粮取净重
 //        if ("潮粮".equals(paymentManagement1.getType())) {
 //            warehouseInOutInfo1.setPureWeight(paymentManagement.getPureWeight() / 1000);
 //            warehouseInOutInfo1.setNetWeight(paymentManagement.getNetWeight() / 1000);
@@ -349,120 +355,120 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
 //            warehouseInOutInfo1.setNetWeight(paymentManagement.getNetWeight() / 1000);
 //
 //        }
-        if(paymentManagement.getPureWeight() != null){
-            warehouseInOutInfo1.setPureWeight(paymentManagement.getPureWeight() / 1000);
-        }
-        warehouseInOutInfo1.setNetWeight(Double.valueOf(paymentManagement.getNetWeight() / 1000));
-        warehouseInOutInfo1.setStatusFlag("3");
-        warehouseInOutInfo1.setDeductionWeight(paymentManagement.getWeightDeduction());
-        warehouseInOutInfoService.insert(warehouseInOutInfo1);
-        float original = 0f;
-        // 查询货物库存量
-        WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
-                .eq("position_id", warehouseInOutInfo1.getPositionId())
-                .eq("goods_name_key", warehouseInOutInfo1.getGoodsNameKey())
-                .eq("delete_flag", "0"));
-        // 判断是否有货
-        if (warehousePositionStorageInfo != null) {
-            original = Float.valueOf(String.valueOf(warehousePositionStorageInfo.getStorage()));
-            warehousePositionStorageInfo.setGoodsNameKey(warehouseInOutInfo1.getGoodsNameKey());
-            // 更新库存量
-            warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() + Float.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())));
-            warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
-        }
-        // 没有货
-        else {
-            original = 0f;
-            WarehousePositionStorageInfo warehousePositionStorageInfo1 = new WarehousePositionStorageInfo();
-            warehousePositionStorageInfo1.setId(IdGenerator.generateUUID());
-            warehousePositionStorageInfo1.setPositionId(warehouseInOutInfo1.getPositionId());
-            warehousePositionStorageInfo1.setBinNumber(warehouseInOutInfo1.getBinNumber());
-            warehousePositionStorageInfo1.setGoodsName(warehouseInOutInfo1.getGoodsName());
-            warehousePositionStorageInfo1.setGoodsNameKey(warehouseInOutInfo1.getGoodsNameKey());
-            warehousePositionStorageInfo1.setStorage(warehouseInOutInfo1.getNetWeight());
-            warehousePositionStorageInfoService.insert(warehousePositionStorageInfo1);
-        }
-        WarehouseInOutDetail warehouseInOutDetail = new WarehouseInOutDetail();
-        warehouseInOutDetail.setId(IdGenerator.generateUUID());
-        warehouseInOutDetail.setInfoId(warehouseInOutInfo1.getId());
-        warehouseInOutDetail.setQualityInspector(qualityInspectionManagement.getQualityInspector());
-        warehouseInOutDetail.setWaterContent(qualityInspectionManagement.getWaterContent());
-        warehouseInOutDetail.setImpurity(qualityInspectionManagement.getImpurity());
-        warehouseInOutDetail.setBulkDensity(qualityInspectionManagement.getBulkDensity());
-        warehouseInOutDetail.setMildewGrain(qualityInspectionManagement.getMildewGrain());
-        warehouseInOutDetail.setJiaorenli(qualityInspectionManagement.getJiaorenli());
-        warehouseInOutDetail.setImperfectGrain(qualityInspectionManagement.getImperfectGrain());
-        warehouseInOutDetailService.insert(warehouseInOutDetail);
-        WeightedDetails weightedDetails = new WeightedDetails();
-        weightedDetails.setCompId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
-        weightedDetails.setId(IdGenerator.generateUUID());
-        weightedDetails.setWarehouseId(warehouseInOutInfo1.getBaseId());
-        weightedDetails.setWarehouseName(warehouseInOutInfo1.getWarehouseName());
-        weightedDetails.setGoodsNameKey(warehouseInOutInfo1.getGoodsNameKey());
-        weightedDetails.setGoodsName(warehouseInOutInfo1.getGoodsName());
-        weightedDetails.setGrainType(warehouseInOutInfo1.getType());
-        weightedDetails.setInTypeKey(warehouseInOutInfo1.getInOutTypeKey());
-        weightedDetails.setInType(warehouseInOutInfo1.getInOutType());
-        weightedDetails.setNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())));
-        weightedDetails.setPureWeight(warehouseInOutInfo1.getPureWeight());
-        weightedDetails.setUnitPrice(warehouseInOutInfo1.getCost());
-        weightedDetails.setDeductionAmount(warehouseInOutInfo1.getDeductionAmount());
-        weightedDetails.setFreight(warehouseInOutInfo1.getFreight());
-        weightedDetails.setOriginalStock(original);
-
-        // 查询入库全加权成本
-        List<WeightedDetails> weightedDetailsList = weightedDetailsService.selectList(new EntityWrapper<WeightedDetails>().eq("warehouse_id", warehouseInOutInfo1.getBaseId())
-                .eq("goods_name", warehouseInOutInfo1.getGoodsName()).orderBy("update_date", false));
-        if (CollectionUtils.isEmpty(weightedDetailsList)) {
-            Double newCost = (paymentManagement.getAmountIngPayable()- paymentManagement.getAmountIngPayable()*0.09) / (Double.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())) + original);
-            weightedDetails.setCostBefore(Float.valueOf(String.valueOf(newCost)));
-            weightedDetails.setCostAfter(newCost);
-        } else {
-            weightedDetails.setCostBefore(weightedDetailsList.get(0).getCostBefore());
-            Double newCost = ( (paymentManagement.getAmountIngPayable()- paymentManagement.getAmountIngPayable()*0.09) + original * weightedDetails.getCostBefore()) / (Double.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())) + original);
-            weightedDetails.setCostAfter(newCost);
-        }
-        // 计算新加权成本
-
-
-
-        weightedDetailsService.insert(weightedDetails);
-        // 修改成本信息表
-        CostManagementInfo costManagementInfo = costManagementInfoService.selectOne(new EntityWrapper<CostManagementInfo>().eq("warehouse_id", weightedDetails.getWarehouseId())
-                .eq("comp_id",  paymentManagement1.getCompId())
-                .eq("goods_name_key", weightedDetails.getGoodsNameKey()));
-        List<WeightedDetails> weightedDetailsLists = weightedDetailsService.selectList(new EntityWrapper<WeightedDetails>().eq("warehouse_id", warehouseInOutInfo1.getBaseId())
-                .eq("goods_name_key", warehouseInOutInfo1.getGoodsNameKey()).orderBy("update_date", false));
-        Double net = 0d;
-        List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
-                .eq("base_id", weightedDetails.getWarehouseId()));
-        if (!CollectionUtils.isEmpty(warehousePositionInfos)) {
-            for (int i = 0; i < warehousePositionInfos.size(); i++) {
-                List<WarehousePositionStorageInfo> warehousePositionStorageInfos = warehousePositionStorageInfoService.selectList(new EntityWrapper<WarehousePositionStorageInfo>()
-                        .eq("position_id", warehousePositionInfos.get(i).getId())
-                        .eq("goods_name_key", weightedDetails.getGoodsNameKey()));
-                for (int j = 0; j < warehousePositionStorageInfos.size(); j++) {
-                    net = net + warehousePositionStorageInfos.get(j).getStorage();
+            if (paymentManagement.getPureWeight() != null) {
+                warehouseInOutInfo1.setPureWeight(paymentManagement.getPureWeight() / 1000);
+            }
+            warehouseInOutInfo1.setNetWeight(Double.valueOf(paymentManagement.getNetWeight() / 1000));
+            warehouseInOutInfo1.setStatusFlag("3");
+            warehouseInOutInfo1.setDeductionWeight(paymentManagement.getWeightDeduction());
+            warehouseInOutInfoService.insert(warehouseInOutInfo1);
+            float original = 0f;
+            // 查询货物库存量
+            WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
+                    .eq("position_id", warehouseInOutInfo1.getPositionId())
+                    .eq("goods_name_key", warehouseInOutInfo1.getGoodsNameKey())
+                    .eq("delete_flag", "0"));
+            // 判断是否有货
+            if (warehousePositionStorageInfo != null) {
+                original = Float.valueOf(String.valueOf(warehousePositionStorageInfo.getStorage()));
+                warehousePositionStorageInfo.setGoodsNameKey(warehouseInOutInfo1.getGoodsNameKey());
+                // 更新库存量
+                warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() + Float.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())));
+                warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
+            }
+            // 没有货
+            else {
+                original = 0f;
+                WarehousePositionStorageInfo warehousePositionStorageInfo1 = new WarehousePositionStorageInfo();
+                warehousePositionStorageInfo1.setId(IdGenerator.generateUUID());
+                warehousePositionStorageInfo1.setPositionId(warehouseInOutInfo1.getPositionId());
+                warehousePositionStorageInfo1.setBinNumber(warehouseInOutInfo1.getBinNumber());
+                warehousePositionStorageInfo1.setGoodsName(warehouseInOutInfo1.getGoodsName());
+                warehousePositionStorageInfo1.setGoodsNameKey(warehouseInOutInfo1.getGoodsNameKey());
+                warehousePositionStorageInfo1.setStorage(warehouseInOutInfo1.getNetWeight());
+                warehousePositionStorageInfoService.insert(warehousePositionStorageInfo1);
+            }
+            WarehouseInOutDetail warehouseInOutDetail = new WarehouseInOutDetail();
+            warehouseInOutDetail.setId(IdGenerator.generateUUID());
+            warehouseInOutDetail.setInfoId(warehouseInOutInfo1.getId());
+            warehouseInOutDetail.setQualityInspector(qualityInspectionManagement.getQualityInspector());
+            warehouseInOutDetail.setWaterContent(qualityInspectionManagement.getWaterContent());
+            warehouseInOutDetail.setImpurity(qualityInspectionManagement.getImpurity());
+            warehouseInOutDetail.setBulkDensity(qualityInspectionManagement.getBulkDensity());
+            warehouseInOutDetail.setMildewGrain(qualityInspectionManagement.getMildewGrain());
+            warehouseInOutDetail.setJiaorenli(qualityInspectionManagement.getJiaorenli());
+            warehouseInOutDetail.setImperfectGrain(qualityInspectionManagement.getImperfectGrain());
+            warehouseInOutDetailService.insert(warehouseInOutDetail);
+            WeightedDetails weightedDetails = new WeightedDetails();
+            weightedDetails.setCompId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
+            weightedDetails.setId(IdGenerator.generateUUID());
+            weightedDetails.setWarehouseId(warehouseInOutInfo1.getBaseId());
+            weightedDetails.setWarehouseName(warehouseInOutInfo1.getWarehouseName());
+            weightedDetails.setGoodsNameKey(warehouseInOutInfo1.getGoodsNameKey());
+            weightedDetails.setGoodsName(warehouseInOutInfo1.getGoodsName());
+            weightedDetails.setGrainType(warehouseInOutInfo1.getType());
+            weightedDetails.setInTypeKey(warehouseInOutInfo1.getInOutTypeKey());
+            weightedDetails.setInType(warehouseInOutInfo1.getInOutType());
+            weightedDetails.setNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())));
+            weightedDetails.setPureWeight(warehouseInOutInfo1.getPureWeight());
+            weightedDetails.setUnitPrice(warehouseInOutInfo1.getCost());
+            weightedDetails.setDeductionAmount(warehouseInOutInfo1.getDeductionAmount());
+            weightedDetails.setFreight(warehouseInOutInfo1.getFreight());
+            weightedDetails.setOriginalStock(original);
+
+            // 查询入库全加权成本
+            List<WeightedDetails> weightedDetailsList = weightedDetailsService.selectList(new EntityWrapper<WeightedDetails>().eq("warehouse_id", warehouseInOutInfo1.getBaseId())
+                    .eq("goods_name", warehouseInOutInfo1.getGoodsName()).orderBy("update_date", false));
+            if (CollectionUtils.isEmpty(weightedDetailsList)) {
+                Double newCost = (paymentManagement.getAmountIngPayable() - paymentManagement.getAmountIngPayable() * 0.09) / (Double.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())) + original);
+                weightedDetails.setCostBefore(Float.valueOf(String.valueOf(newCost)));
+                weightedDetails.setCostAfter(newCost);
+            } else {
+                weightedDetails.setCostBefore(weightedDetailsList.get(0).getCostBefore());
+                Double newCost = ((paymentManagement.getAmountIngPayable() - paymentManagement.getAmountIngPayable() * 0.09) + original * weightedDetails.getCostBefore()) / (Double.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())) + original);
+                weightedDetails.setCostAfter(newCost);
+            }
+            // 计算新加权成本
+
+
+            weightedDetailsService.insert(weightedDetails);
+            // 修改成本信息表
+            CostManagementInfo costManagementInfo = costManagementInfoService.selectOne(new EntityWrapper<CostManagementInfo>().eq("warehouse_id", weightedDetails.getWarehouseId())
+                    .eq("comp_id", paymentManagement1.getCompId())
+                    .eq("goods_name_key", weightedDetails.getGoodsNameKey()));
+            List<WeightedDetails> weightedDetailsLists = weightedDetailsService.selectList(new EntityWrapper<WeightedDetails>().eq("warehouse_id", warehouseInOutInfo1.getBaseId())
+                    .eq("goods_name_key", warehouseInOutInfo1.getGoodsNameKey()).orderBy("update_date", false));
+            Double net = 0d;
+            List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
+                    .eq("base_id", weightedDetails.getWarehouseId()));
+            if (!CollectionUtils.isEmpty(warehousePositionInfos)) {
+                for (int i = 0; i < warehousePositionInfos.size(); i++) {
+                    List<WarehousePositionStorageInfo> warehousePositionStorageInfos = warehousePositionStorageInfoService.selectList(new EntityWrapper<WarehousePositionStorageInfo>()
+                            .eq("position_id", warehousePositionInfos.get(i).getId())
+                            .eq("goods_name_key", weightedDetails.getGoodsNameKey()));
+                    for (int j = 0; j < warehousePositionStorageInfos.size(); j++) {
+                        net = net + warehousePositionStorageInfos.get(j).getStorage();
+                    }
                 }
             }
-        }
-        if (costManagementInfo == null) {
-            CostManagementInfo costManagementInfo1 = new CostManagementInfo();
-            costManagementInfo1.setCompId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
-            costManagementInfo1.setId(IdGenerator.generateUUID());
-            costManagementInfo1.setWarehouseId(weightedDetails.getWarehouseId());
-            costManagementInfo1.setWarehouseName(weightedDetails.getWarehouseName());
-            costManagementInfo1.setGoodsNameKey(weightedDetails.getGoodsNameKey());
-            costManagementInfo1.setGoodsName(weightedDetails.getGoodsName());
-            costManagementInfo1.setWarehouseType(warehouseBaseInfo.getWarehouseType());
-
-            costManagementInfo1.setStorage(net);
-            costManagementInfo1.setCost(weightedDetails.getCostAfter());
-            costManagementInfoService.insert(costManagementInfo1);
-        } else {
-            costManagementInfo.setCost(weightedDetails.getCostAfter());
-            costManagementInfo.setStorage(net);
-            costManagementInfoService.updateById(costManagementInfo);
+            if (costManagementInfo == null) {
+                CostManagementInfo costManagementInfo1 = new CostManagementInfo();
+                costManagementInfo1.setCompId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
+                costManagementInfo1.setId(IdGenerator.generateUUID());
+                costManagementInfo1.setWarehouseId(weightedDetails.getWarehouseId());
+                costManagementInfo1.setWarehouseName(weightedDetails.getWarehouseName());
+                costManagementInfo1.setGoodsNameKey(weightedDetails.getGoodsNameKey());
+                costManagementInfo1.setGoodsName(weightedDetails.getGoodsName());
+                costManagementInfo1.setWarehouseType(warehouseBaseInfo.getWarehouseType());
+
+                costManagementInfo1.setStorage(net);
+                costManagementInfo1.setCost(weightedDetails.getCostAfter());
+                costManagementInfoService.insert(costManagementInfo1);
+            } else {
+                costManagementInfo.setCost(weightedDetails.getCostAfter());
+                costManagementInfo.setStorage(net);
+                costManagementInfoService.updateById(costManagementInfo);
+            }
         }
         return "OK";
     }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/QualityInspectionManagementServiceImpl.java

@@ -166,7 +166,6 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String editQualityInspection(QualityInspectionManagement qualityInspectionManagement) {
-        QualityInspectionManagement qualityInspectionManagement1=this.selectById(qualityInspectionManagement.getId());
         CommonStaff commonStaff = staffService.getInfo(AuthSecurityUtils.getCurrentUserId());
         //复检
         if ("1".equals(qualityInspectionManagement.getFlag())){
@@ -188,6 +187,8 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
                 weighingManagementService.updateById(weighingManagement);
             }
         }
+        boolean one=this.updateById(qualityInspectionManagement);
+        QualityInspectionManagement qualityInspectionManagement1=this.selectById(qualityInspectionManagement.getId());
         PaymentManagement paymentManagement=paymentManagementService.selectOne(new EntityWrapper<PaymentManagement>()
                 .eq("relation_id",qualityInspectionManagement1.getRelationId())
                 .eq("status","待结算")
@@ -200,18 +201,24 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
             else {
                 paymentManagement.setSolidGrainPrice(qualityInspectionManagement1.getDryGrainPrice());
             }
-            WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
-                    .eq("comp_id",qualityInspectionManagement1.getCompId())
-                    .eq("delete_flag","0")
-                    .eq("relation_id", qualityInspectionManagement1.getRelationId()));
-            if(weighingManagement!=null){
-                weighingManagement.setStorageNumber(qualityInspectionManagement1.getStorageTagNo());
-                weighingManagement.setBinNumber(qualityInspectionManagement1.getBinNumber());
-                weighingManagement.setCarNumber(qualityInspectionManagement1.getCarNumber());
-                weighingManagementService.updateById(weighingManagement);
-            }
+            paymentManagement.setCustomerName(qualityInspectionManagement1.getCustomerName());
+            paymentManagement.setCustomerPhone(qualityInspectionManagement1.getCustomerPhone());
+            paymentManagement.setCustomerNumberCard(qualityInspectionManagement1.getCustomerNumberCard());
+            paymentManagementService.updateById(paymentManagement);
+        }
+        WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
+                .eq("comp_id",qualityInspectionManagement1.getCompId())
+                .eq("delete_flag","0")
+                .eq("relation_id", qualityInspectionManagement1.getRelationId()));
+        if(weighingManagement!=null){
+            weighingManagement.setStorageNumber(qualityInspectionManagement1.getStorageTagNo());
+            weighingManagement.setBinNumber(qualityInspectionManagement1.getBinNumber());
+            weighingManagement.setCarNumber(qualityInspectionManagement1.getCarNumber());
+            weighingManagement.setCustomer(qualityInspectionManagement1.getCustomerName());
+            weighingManagement.setCustomerPhone(qualityInspectionManagement1.getCustomerPhone());
+            weighingManagement.setCustomerNumberCard(qualityInspectionManagement1.getCustomerNumberCard());
+            weighingManagementService.updateById(weighingManagement);
         }
-        boolean one=this.updateById(qualityInspectionManagement);
         //成功返回ok
         if (one ) {
             return "OK";
@@ -260,6 +267,7 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         //生成检斤信息
         WeighingManagement weighingManagement=new WeighingManagement();
         weighingManagement.setId(IdGenerator.generateUUID());
+        weighingManagement.setWarehouseInOutId(qualityInspectionManagement.getWarehouseInOutId());
         weighingManagement.setRelationId(qualityInspectionManagement.getRelationId());
         weighingManagement.setContractNo(qualityInspectionManagement.getContractNo());
         weighingManagement.setOutType(qualityInspectionManagement.getOutType());

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WeighingManagementMapper.xml

@@ -50,6 +50,7 @@
         a.comp_id as compId,
         a.number,
         a.customer,
+        a.warehouse_in_out_id as warehouseInOutId,
         a.customer_number_card as customerNumberCard,
         a.service_management_type as serviceManagementType,
         a.customer_phone as customerPhone,