1

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

@@ -1020,7 +1020,12 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 //移库看成自运
                 contractManagementInfo.setDeliverType("1");
                 contractManagementInfo.setContractNo(inOutWarehouseTask.getMoveTaskNo());
-                contractManagementInfo.setContractPrice(inOutWarehouseTask.getUnitPrice());
+                ContractManagementInfo contractManagementInfo1=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                        .eq("contract_no",inOutWarehouseTask.getWarehouseName())
+                        .eq("comp_id",inOutWarehouseTask.getCompId()));
+                if (contractManagementInfo1!=null) {
+                    contractManagementInfo.setContractPrice(Float.valueOf(String.valueOf(contractManagementInfo1.getUnitContractPrice())));
+                }
                 contractManagementInfo.setGrade(inOutWarehouseTask.getGrade());
                 contractManagementInfo.setSendWarehouse(inOutWarehouseTask.getSendWarehouse());
                 contractManagementInfo.setReceiveWarehouse(inOutWarehouseTask.getReceiveWarehouse());
@@ -1433,7 +1438,12 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     contractManagementInfo1.setShipInfoList(shipInfoList);
                 }
                 contractManagementInfo1.setContractNo(inOutWarehouseTask.getMoveTaskNo());
-                contractManagementInfo1.setContractPrice(inOutWarehouseTask.getUnitPrice());
+                ContractManagementInfo contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                .eq("contract_no",inOutWarehouseTask.getWarehouseName())
+                .eq("comp_id",inOutWarehouseTask.getCompId()));
+                if (contractManagementInfo!=null) {
+                    contractManagementInfo1.setContractPrice(Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
+                }
                 //自运采购的移库
                 ContractManagementInfo contractManagementInfo2 = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                         .eq("comp_id", inOutWarehouseTask.getCompId())

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

@@ -4229,6 +4229,28 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             tranCarInfoService.updateById(tranCarInfo);
                         }
                     }
+                    if (warehouseInOutInfo.getWeighingManagement() != null) {
+                        //毛重检斤
+                        //状态改为已称毛重
+                        WeighingManagement weighingManagement1 = warehouseInOutInfo.getWeighingManagement();
+                        weighingManagement1.setStatus(StatusEnum.WEIGHED_GROSS_WEIGHT.getName());
+                        weighingManagement1.setStatusFlag(StatusEnum.WEIGHED_GROSS_WEIGHT.getFlag());
+                        weighingManagement1.setGrossDate(new Date());
+                        weighingManagement1.setSecretaryWeigher(commonStaff.getStaffName());
+                        //质检信息
+                        QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
+                                .eq("relation_id", weighingManagement1.getRelationId())
+                                .eq("comp_id", commonStaff.getCompId()));
+                        if (qualityInspectionManagement != null) {
+                            qualityInspectionManagement.setCarNumber(warehouseInOutInfo.getCarNo());
+                            //状态改为已称毛重
+                            qualityInspectionManagementService.updateById(qualityInspectionManagement);
+                        }
+                        if (weighingManagement1.getGrossWeight() == null || weighingManagement1.getGrossWeight() == 0) {
+                            throw new YException(YExceptionEnum.GROSSWEIGHT_NULL);
+                        }
+                        weighingManagementService.updateById(weighingManagement1);
+                    }
                     Wrapper<InOutWarehouseTask> inOutWarehouseTaskWrapper = new EntityWrapper<>();
                     inOutWarehouseTaskWrapper.eq("in_out_flag", "1").eq("delete_flag", "0");
                     inOutWarehouseTaskWrapper.andNew().eq("move_task_no", warehouseInOutInfo.getContractNo()).or()