批量复合

mhd_wms/sql/pdaSql.sql

@@ -51,6 +51,11 @@ 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;
+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;
+
 
 
 

mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/ReviewOrderDomainService.java

@@ -163,7 +163,7 @@ public class ReviewOrderDomainService {
         if (reviewOrderId == null) {
             throw new ServiceException("复核单主表保存失败");
         }
-
+        String outOrderNumber1 = stockOutOrder.getOutOrderNumber();
         int detailInserted = 0;
         for (PickingOrder po : pickingOrders) {
             List<PickingMaterialDetail> lines = pickingMaterialDetailService.list(new LambdaQueryWrapper<PickingMaterialDetail>()
@@ -175,6 +175,7 @@ public class ReviewOrderDomainService {
                     continue;
                 }
                 ReviewMaterialDetail row = buildDetailFromPicking(line, reviewOrderId, reviewOrderNumber, outOrderNumber, loginUser, now);
+                row.setOutOrderNumber(outOrderNumber1);
                 reviewMaterialDetailMapper.insert(row);
                 detailInserted++;
             }
@@ -211,6 +212,11 @@ public class ReviewOrderDomainService {
         d.setBarCode(line.getBarCode());
         d.setUnitCode(line.getUnitCode());
         d.setUnitName(line.getUnitName());
+        d.setLotNo(line.getLotNo());
+        d.setPackId(String.valueOf(line.getPackId()));
+        d.setPackCode(line.getPackCode());
+        d.setPackName(line.getPackName());
+        d.setPackDetailId(String.valueOf(line.getPackDetailId()));
 
         BigDecimal pending = line.getPickingQuantity() != null ? line.getPickingQuantity() : line.getQuantity();
         if (pending == null) {

mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/entity/ReviewMaterialDetail.java

@@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mhd.common.core.annotation.Excel;
 import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -54,6 +58,10 @@ public class ReviewMaterialDetail extends BaseVOEntity {
 
     private String batchNumber;
 
+    @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;
 
     private Date expiryDate;
@@ -89,4 +97,20 @@ public class ReviewMaterialDetail extends BaseVOEntity {
     private BigDecimal areaSqm;
 
     private String remark;
+
+    @ApiModelProperty("包装规格id")
+    @Excel(name = "包装规格id")
+    private String packId;
+
+    @ApiModelProperty("包装规格编码")
+    @Excel(name = "包装规格编码")
+    private String packCode;
+
+    @ApiModelProperty("包装规格名称")
+    @Excel(name = "包装规格名称")
+    private String packName;
+
+    @ApiModelProperty("包装详情id")
+    @Excel(name = "包装详情id")
+    private String packDetailId;
 }

mhd_wms/src/main/resources/mapper/reviewOrder/ReviewOrderMapper.xml

@@ -233,7 +233,8 @@
         d.update_by,
         d.update_by_name,
         d.update_time,
-        d.del_flag
+        d.del_flag,
+        d.pack_id, d.pack_code, d.pack_name, d.pack_detail_id
     </sql>
 
     <!-- 详情：明细 by 复核单主键 -->