Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401

mhd_wms/sql/pdaSql.sql

@@ -55,6 +55,7 @@ ALTER TABLE NGWL_TEST_WMS.REVIEW_MATERIAL_DETAIL ADD PACK_ID varchar(100) NULL;
 ALTER TABLE NGWL_TEST_WMS.REVIEW_MATERIAL_DETAIL ADD PACK_CODE varchar(100) NULL;
 ALTER TABLE NGWL_TEST_WMS.REVIEW_MATERIAL_DETAIL ADD PACK_NAME varchar(100) NULL;
 ALTER TABLE NGWL_TEST_WMS.REVIEW_MATERIAL_DETAIL ADD PACK_DETAIL_ID varchar(100) NULL;
+ALTER TABLE NGWL_TEST_WMS.PICKING_MATERIAL_DETAIL ADD IN_ORDER_NUMBER varchar(100) NULL;
 
 
 

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

@@ -295,4 +295,8 @@ public class PickingMaterialDetail extends BaseVOEntity {
     @ApiModelProperty("lot编号")
     @Excel(name = "lot编号")
     private String lotNo;
+
+    @ApiModelProperty("入库单号")
+    @Excel(name = "入库单号")
+    private String inOrderNumber;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/persistence/PickingMaterialDetailImpl.java

@@ -184,6 +184,9 @@ public class PickingMaterialDetailImpl extends ServiceImpl<PickingMaterialDetail
                             .update();
                 }
             }
+            pickingMaterialDetail.setLotNo(pickingMaterialDetailDO.getLotNo());
+            pickingMaterialDetail.setInOrderNumber(pickingMaterialDetailDO.getInOrderNumber());
+            pickingMaterialDetail.setProductionDate(pickingMaterialDetailDO.getProductionDate());
             pickingMaterialDetail.setMaterialDetailId(pickingMaterialDetailDO.getMaterialDetailId());
             pickingMaterialDetail.setUpdateBy(loginUser.getUserid());
             pickingMaterialDetail.setUpdateByName(loginUser.getUsername());

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

@@ -302,4 +302,8 @@ public class PickingMaterialDetailDO extends BaseVOEntity {
     @ApiModelProperty("lot编号")
     @Excel(name = "lot编号")
     private String lotNo;
+
+    @ApiModelProperty("入库单号")
+    @Excel(name = "入库单号")
+    private String inOrderNumber;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingMaterialDetail/PickingMaterialDetailDTO.java

@@ -1,5 +1,6 @@
 package com.mhd.wms.interfaces.dto.pickingMaterialDetail;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.mhd.common.core.annotation.Excel;
@@ -7,8 +8,10 @@ import com.mhd.common.core.web.domain.BaseVOEntity;
 import com.mhd.wms.domain.outMaterialDetailSerialNumber.repository.todo.OutMaterialDetailSerialNumberDO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -236,4 +239,18 @@ public class PickingMaterialDetailDTO extends BaseVOEntity {
     @ApiModelProperty("抄码id数组 逗号分隔")
     @Excel(name = "抄码id数组")
     private String copyCodeReferenceIds;
+
+    @ApiModelProperty("lot编号")
+    @Excel(name = "lot编号")
+    private String lotNo;
+
+    @ApiModelProperty("入库单号")
+    @Excel(name = "入库单号")
+    private String inOrderNumber;
+
+    @ApiModelProperty("生产日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date productionDate;
 }

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

@@ -65,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="copyCodeReferenceIds"    column="COPY_CODE_REFERENCE_IDS"    />
         <result property="pickedCopyCodeReferenceIds"    column="picked_copy_code_reference_ids"    />
         <result property="lotNo"    column="lot_no"    />
+        <result property="inOrderNumber"    column="in_order_number"    />
     </resultMap>
 
 
@@ -83,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.COPY_CODE_REFERENCE_IDS,
         a.picked_copy_code_reference_ids,
         omd.in_order_number, omd.lot_no as lot_number,
-        a.lot_No
+        a.lot_No,a.in_order_number
     </sql>
 
     <sql id="selectPickingMaterialDetailPo1">