Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-wms/src/main/java/com/klp/domain/WmsBatch.java

@@ -62,5 +62,8 @@ public class WmsBatch extends BaseEntity {
      * 备注
      */
     private String remark;
-
+    /**
+     * 排产计划ID
+     */
+    private Long planId;
 }

klp-wms/src/main/java/com/klp/domain/bo/WmsBatchBo.java

@@ -68,5 +68,10 @@ public class WmsBatchBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 排产计划ID
+     */
+    private Long planId;
+
 
 }

klp-wms/src/main/java/com/klp/domain/vo/WmsBatchVo.java

@@ -80,5 +80,9 @@ public class WmsBatchVo {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 排产计划ID
+     */
+    private Long planId;
 
 }

klp-wms/src/main/java/com/klp/service/impl/WmsBatchServiceImpl.java

@@ -69,6 +69,7 @@ public class WmsBatchServiceImpl implements IWmsBatchService {
         lqw.eq(bo.getEstimatedStartTime() != null, WmsBatch::getEstimatedStartTime, bo.getEstimatedStartTime());
         lqw.eq(bo.getEstimatedEndTime() != null, WmsBatch::getEstimatedEndTime, bo.getEstimatedEndTime());
         lqw.eq(StringUtils.isNotBlank(bo.getBatchStatus()), WmsBatch::getBatchStatus, bo.getBatchStatus());
+        lqw.eq(bo.getPlanId() != null, WmsBatch::getPlanId, bo.getPlanId());
         return lqw;
     }
 

klp-wms/src/main/resources/mapper/klp/WmsBatchMapper.xml

@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createBy" column="create_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="updateBy" column="update_by"/>
+        <result property="planId" column="plan_id"/>
     </resultMap>