拣货页面补全缺少东西

mhd_wms/sql/pdaSql.sql

@@ -44,5 +44,13 @@ ALTER TABLE NGWL_TEST_WMS.SHELF_MATERIAL_DETAIL ADD OMS_IN_MATERIAL_DETAIL varch
 ALTER TABLE NGWL_TEST_OMS.RESERVATION_IN_MATERIAL_DETAIL ADD INBOUND_ITEMS varchar(100) NULL;
 ALTER TABLE NGWL_TEST_OMS.RESERVATION_OUT_MATERIAL_DETAIL ADD INBOUND_ITEMS varchar(100) NULL;
 ALTER TABLE NGWL_TEST_WMS.STOCK_RECEIPT_ORDER ADD BUSINESS_ORDER_NO varchar(100) NULL;
+ALTER TABLE NGWL_TEST_WMS.PICKING_ORDER ADD BUSINESS_ORDER_NO varchar(100) NULL;
+ALTER TABLE NGWL_TEST_WMS.PICKING_ORDER ADD OUT_ORDER_NUMBER varchar(100) NULL;
+ALTER TABLE NGWL_TEST_WMS.PICKING_ORDER ADD ORDER_TYPE_CODE varchar(100) NULL;
+ALTER TABLE NGWL_TEST_WMS.PICKING_ORDER ADD ORDER_TYPE_NAME varchar(100) NULL;
+ALTER TABLE NGWL_TEST_WMS.PICKING_ORDER ADD PRIORITY_LEVEL_CODE varchar(100) NULL;
+ALTER TABLE NGWL_TEST_WMS.PICKING_ORDER ADD PRIORITY_LEVEL_NAME varchar(100) NULL;
+ALTER TABLE NGWL_TEST_WMS.PICKING_MATERIAL_DETAIL ADD lotNo varchar(100) NULL;
+
 
 

mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/entity/PickingMaterialDetail.java

@@ -291,4 +291,8 @@ public class PickingMaterialDetail extends BaseVOEntity {
     @ApiModelProperty("已拣抄码对照id（逗号分隔，乱序拣货用）")
     @Excel(name = "已拣抄码对照id")
     private String pickedCopyCodeReferenceIds;
+
+    @ApiModelProperty("lot编号")
+    @Excel(name = "lot编号")
+    private String lotNo;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/po/PickingMaterialDetailPO.java

@@ -321,4 +321,7 @@ public class PickingMaterialDetailPO extends BaseVOEntity {
     @TableField(exist = false)
     private List<CopyCodeReferencePO> weightList;
 
+    @ApiModelProperty("LOT编码2")
+    private String lotNo;
+
 }

mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/todo/PickingMaterialDetailDO.java

@@ -298,4 +298,8 @@ public class PickingMaterialDetailDO extends BaseVOEntity {
 
     @ApiModelProperty("已拣抄码对照id（逗号分隔，合并写入）")
     private String pickedCopyCodeReferenceIds;
+
+    @ApiModelProperty("lot编号")
+    @Excel(name = "lot编号")
+    private String lotNo;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/po/PickingOrderPO.java

@@ -122,6 +122,30 @@ public class PickingOrderPO extends StockOutOrderBasePO {
     @ApiModelProperty("物料明细")
     private List<PickingMaterialDetailPO> materialDetailList;
 
+    @ApiModelProperty("出库单号")
+    @Excel(name = "出库单号")
+    private String outOrderNumber;
+
+    @ApiModelProperty("业务单号")
+    @Excel(name = "业务单号")
+    private String businessOrderNo;
+
+    @ApiModelProperty("出库单类型编码")
+    @Excel(name = "出库单类型编码")
+    private String orderTypeCode;
+
+    @ApiModelProperty("出库单类型名称")
+    @Excel(name = "出库单类型名称")
+    private String orderTypeName;
+
+    @ApiModelProperty("优先级别编码")
+    @Excel(name = "优先级别编码")
+    private String priorityLevelCode;
+
+    @ApiModelProperty("优先级别名称")
+    @Excel(name = "优先级别名称")
+    private String priorityLevelName;
+
 
 
 }

mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java

@@ -168,4 +168,28 @@ public class PickingOrderDO extends BaseVOEntity {
     @ApiModelProperty("作业拣货物料种数（当前拣货作业物料种数）")
     @Excel(name = "作业拣货物料种数（当前拣货作业物料种数）")
     private Integer actualPickingMaterialQuantity;
+
+    @ApiModelProperty("出库单号")
+    @Excel(name = "出库单号")
+    private String outOrderNumber;
+
+    @ApiModelProperty("业务单号")
+    @Excel(name = "业务单号")
+    private String businessOrderNo;
+
+    @ApiModelProperty("出库单类型编码")
+    @Excel(name = "出库单类型编码")
+    private String orderTypeCode;
+
+    @ApiModelProperty("出库单类型名称")
+    @Excel(name = "出库单类型名称")
+    private String orderTypeName;
+
+    @ApiModelProperty("优先级别编码")
+    @Excel(name = "优先级别编码")
+    private String priorityLevelCode;
+
+    @ApiModelProperty("优先级别名称")
+    @Excel(name = "优先级别名称")
+    private String priorityLevelName;
 }

mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml

@@ -64,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="outUniqueId"    column="out_unique_id"    />
         <result property="copyCodeReferenceIds"    column="COPY_CODE_REFERENCE_IDS"    />
         <result property="pickedCopyCodeReferenceIds"    column="picked_copy_code_reference_ids"    />
+        <result property="lotNo"    column="lot_no"    />
     </resultMap>
 
 
@@ -81,7 +82,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.total_area, a.total_gross_weight, a.total_net_weight, a.total_volume, a.out_unique_id,
         a.COPY_CODE_REFERENCE_IDS,
         a.picked_copy_code_reference_ids,
-        omd.in_order_number, omd.lot_no as lot_number
+        omd.in_order_number, omd.lot_no as lot_number,
+        a.lot_No
     </sql>
 
     <sql id="selectPickingMaterialDetailPo1">

mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml

@@ -26,6 +26,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateByName"    column="update_by_name"    />
         <result property="delFlag"    column="del_flag"    />
+        <result property="outOrderNumber"    column="out_order_number"    />
+        <result property="businessOrderNo"    column="business_order_no"    />
+        <result property="orderTypeCode"    column="order_type_code"    />
+        <result property="orderTypeName"    column="order_type_name"    />
+        <result property="priorityLevelCode"    column="priority_level_code"    />
+        <result property="priorityLevelName"    column="priority_level_name"    />
     </resultMap>
 
 
@@ -34,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.status, a.type, a.warehouse_id, a.warehouse_code, a.warehouse_name, a.shipper_id, a.shipper_name, a.quantity, a.weight_limit, a.volume_limit, a.material_quantity,
         IFNULL((SELECT SUM(b.picking_quantity) FROM picking_material_detail b WHERE b.picking_order_number = a.picking_order_number AND b.del_flag = 1), 0) AS picking_quantity,
         a.picking_material_quantity, a.abnormal, a.task_distribution, a.remark, a.create_time, a.create_by, a.create_by_name, a.update_time,
-        a.update_by, a.update_by_name, a.del_flag
+        a.update_by, a.update_by_name, a.del_flag,a.out_order_number, a.business_order_no, a.order_type_code, a.order_type_name, a.priority_level_code, a.priority_level_name
     </sql>
 
     <sql id="selectPickingOrderPo1">