1

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

@@ -343,23 +343,23 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             warehouseInOutInfo.setInOutDate(new Date());
             warehouseInOutInfo.setStatus("已提交");
             warehouseInOutInfo.setPaymentId(paymentManagement.getId());
-            //更新出入库任务表已完成量
-            InOutWarehouseTask inOutWarehouseTask = inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
-                    .eq("in_out_task_no", warehouseInOutInfo.getInOutTaskNo()));
-            if (inOutWarehouseTask != null) {
-                //可超出重量
-                Float overNeight = 0.0f;
-                ContractManagementInfo contractManagementInfo = ContractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
-                        .eq("comp_id", inOutWarehouseTask.getCompId())
-                        .eq("contract_no", inOutWarehouseTask.getContractNo()));
-                overNeight = inOutWarehouseTask.getWeight() * (contractManagementInfo.getOverShort() / 100);
-                inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity() + warehouseInOutInfo.getNetWeight());
-                if (inOutWarehouseTask.getCompletedQuantity() > inOutWarehouseTask.getWeight() + overNeight) {
-                    throw new YException(YExceptionEnum.TASK_WEIGHT_EXCEEDED_ERROR);
-                } else {
-                    inOutWarehouseTaskService.updateById(inOutWarehouseTask);
-                }
-            }
+//            //更新出入库任务表已完成量
+//            InOutWarehouseTask inOutWarehouseTask = inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
+//                    .eq("in_out_task_no", warehouseInOutInfo.getInOutTaskNo()));
+//            if (inOutWarehouseTask != null) {
+//                //可超出重量
+//                Float overNeight = 0.0f;
+//                ContractManagementInfo contractManagementInfo = ContractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+//                        .eq("comp_id", inOutWarehouseTask.getCompId())
+//                        .eq("contract_no", inOutWarehouseTask.getContractNo()));
+//                overNeight = inOutWarehouseTask.getWeight() * (contractManagementInfo.getOverShort() / 100);
+//                inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity() + warehouseInOutInfo.getNetWeight());
+//                if (inOutWarehouseTask.getCompletedQuantity() > inOutWarehouseTask.getWeight() + overNeight) {
+//                    throw new YException(YExceptionEnum.TASK_WEIGHT_EXCEEDED_ERROR);
+//                } else {
+//                    inOutWarehouseTaskService.updateById(inOutWarehouseTask);
+//                }
+//            }
             CommonSysParameter commonSysParameter = iCommonSysParameterService.selectOne(new EntityWrapper<CommonSysParameter>().eq("const_id", "CON2").eq("const_value", paymentManagement1.getGoodsName()));
             warehouseInOutInfo.setGoodsNameKey(commonSysParameter.getConstKey());
             warehouseInOutInfo.setInOutFlag("2");

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

@@ -224,14 +224,14 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                     tranCarInfo.setCompId(tranTaskInfo.getCompId());
                     //船运集装箱
                     if (tranCarInfoList.get(0).getTranType().equals(NumberConstant.CONSTANT3)&&"集装箱".equals(tranCarInfoList.get(0).getShipType())) {
-                        for(int i=0;i<tranCarInfoList.get(0).getBoxNumber();i++){
+//                        for(int i=0;i<tranCarInfoList.get(0).getBoxNumber();i++){
                             tranCarInfo.setProcessId(tranProcessInfo.getId());
                             tranCarInfo.setInfoId(tranProcessInfo.getInfoId());
                             tranCarInfo.setId(IdGenerator.generateUUID());
                             tranCarInfo.setStatusFlag(StatusEnum.NOT_LOADED.getFlag());
                             tranCarInfo.setStatus(StatusEnum.NOT_LOADED.getName());
                             tranCarInfoService.insert(tranCarInfo);
-                        }
+//                        }
                     }
                     else {
                         tranCarInfo.setProcessId(tranProcessInfo.getId());