移库编号

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

@@ -163,6 +163,22 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      * 干粮单价（元/吨）
      */
     private Double dryGrainPrice;
+    /**
+     * 水分增价
+     */
+    private Double waterPriceIncrease;
+    /**
+     * 水分扣价
+     */
+    private Double waterPriceDeduction;
+    /**
+     * 质量增价
+     */
+    private Double qualityPriceIncrease;
+    /**
+     * 质量扣价
+     */
+    private Double qualityPriceDeduction;
     /**
      * 仓位编号
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/exception/YExceptionEnum.java

@@ -46,6 +46,7 @@ public enum YExceptionEnum {
 	IN_WEIGHT_STATUS_ERROR("ERROR", "入库检斤《已称皮重》状态不允许删除，请先退回！"),
 	OUT_WEIGHT_STATUS_ERROR("ERROR", "出库检斤《已称毛重》状态不允许删除，请先退回！"),
 	IN_OUT_STATUS_ERROR("ERROR", "出入库记录状态异常"),
+	MOVETASK_NO_ERROR("ERROR", "移库编号已存在，不可重复！"),
 	;
 	@Getter
 	private String value;

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

@@ -140,11 +140,31 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
             else if ("3".equals(inOutWarehouseTask.getTaskTypeKey()) && "1".equals(inOutWarehouseTask.getInOutFlag())) {
                 inOutWarehouseTask.setSendWarehouse(inOutWarehouseTask.getWarehouseName());
                 inOutWarehouseTask.setDeliveryVolume(inOutWarehouseTask.getWeight());
+                //判断移库任务编号是否唯一
+                List<InOutWarehouseTask> inOutWarehouseTasks =
+                        this.selectList(new EntityWrapper<InOutWarehouseTask>()
+                                .eq(InOutWarehouseTask.QueryFiles.COMP_ID,inOutWarehouseTask.getCompId())
+                                .eq("in_out_flag","1")
+                                .eq(InOutWarehouseTask.QueryFiles.MOVE_TASK_NO, inOutWarehouseTask.getMoveTaskNo())
+                                .eq(InOutWarehouseTask.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+                if (inOutWarehouseTasks.size() > 0) {
+                    throw new YException(YExceptionEnum.MOVETASK_NO_ERROR);
+                }
             }
             //新增移库入库任务时，获取收货库和入库量
             else if ("3".equals(inOutWarehouseTask.getTaskTypeKey()) && "2".equals(inOutWarehouseTask.getInOutFlag())) {
                 inOutWarehouseTask.setReceiveWarehouse(inOutWarehouseTask.getWarehouseName());
                 inOutWarehouseTask.setStorageVolume(inOutWarehouseTask.getWeight());
+                //判断移库任务编号是否唯一
+                List<InOutWarehouseTask> inOutWarehouseTasks =
+                        this.selectList(new EntityWrapper<InOutWarehouseTask>()
+                                .eq(InOutWarehouseTask.QueryFiles.COMP_ID,inOutWarehouseTask.getCompId())
+                                .eq("in_out_flag","2")
+                                .eq(InOutWarehouseTask.QueryFiles.MOVE_TASK_NO, inOutWarehouseTask.getMoveTaskNo())
+                                .eq(InOutWarehouseTask.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+                if (inOutWarehouseTasks.size() > 0) {
+                    throw new YException(YExceptionEnum.MOVETASK_NO_ERROR);
+                }
             }
             // 操作主表数据
             this.insert(inOutWarehouseTask);