1

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

@@ -121,6 +121,14 @@ public class TranTaskInfo extends BaseModel<TranTaskInfo> {
      * 附件
      */
     private String enclosure;
+    /**
+     * 卸船重量（吨）
+     */
+    private Double unloadingWeight;
+    /**
+     * 卸船附件
+     */
+    private String unEnclosure;
     /**
      * 运输方式(1汽运2火运3船运)
      */

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

@@ -334,9 +334,9 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             overNeight = inOutWarehouseTask.getWeight() * (contractManagementInfo.getOverShort() / 100);
                         }
                         //移库入库
-                        else {
-                            overNeight = inOutWarehouseTask.getWeight() * 0.08f;
-                        }
+//                        else {
+//                            overNeight = inOutWarehouseTask.getWeight() * 0.08f;
+//                        }
                     }
                     inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity() + warehouseInOutInfo.getNetWeight());
                     if (inOutWarehouseTask.getCompletedQuantity() > inOutWarehouseTask.getWeight() + overNeight) {
@@ -371,9 +371,9 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             overNeight = inOutWarehouseTask.getWeight() * (contractManagementInfo.getOverShort() / 100);
                         }
                         //移库入库
-                        else {
-                            overNeight = inOutWarehouseTask.getWeight() * 0.08f;
-                        }
+//                        else {
+//                            overNeight = inOutWarehouseTask.getWeight() * 0.08f;
+//                        }
                     }
                     inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity() + warehouseInOutInfo.getNetWeight());
                     if (inOutWarehouseTask.getCompletedQuantity() > inOutWarehouseTask.getWeight() + overNeight) {
@@ -2949,9 +2949,9 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             overNeight = inOutWarehouseTask.getWeight() * (contractManagementInfo.getOverShort() / 100);
                         }
                         //移库入库
-                        else {
-                            overNeight = inOutWarehouseTask.getWeight() * 0.08f;
-                        }
+//                        else {
+//                            overNeight = inOutWarehouseTask.getWeight() * 0.08f;
+//                        }
                     }
                     inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity() + warehouseInOutInfo.getNetWeight());
                     if (inOutWarehouseTask.getCompletedQuantity() > inOutWarehouseTask.getWeight() + overNeight) {
@@ -2998,9 +2998,9 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             overNeight = inOutWarehouseTask.getWeight() * (contractManagementInfo.getOverShort() / 100);
                         }
                         //移库入库
-                        else {
-                            overNeight = inOutWarehouseTask.getWeight() * 0.08f;
-                        }
+//                        else {
+//                            overNeight = inOutWarehouseTask.getWeight() * 0.08f;
+//                        }
                     }
                     inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity() + warehouseInOutInfo.getNetWeight());
                     if (inOutWarehouseTask.getCompletedQuantity() > inOutWarehouseTask.getWeight() + overNeight) {

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

@@ -955,7 +955,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         double weight = weighingManagementList.stream().mapToDouble(WeighingManagement::getNetWeight).sum();
         //更新任务完成量
         inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity() + weight);
-        if (inOutWarehouseTask.getCompletedQuantity() > inOutWarehouseTask.getWeight() + inOutWarehouseTask.getWeight() * 0.08f) {
+        if (inOutWarehouseTask.getCompletedQuantity() > inOutWarehouseTask.getWeight()) {
             throw new YException(YExceptionEnum.TASK_WEIGHT_EXCEEDED_ERROR);
         } else {
             inOutWarehouseTaskService.updateById(inOutWarehouseTask);