feat:

2.主表：增加【喷漆状态】 3.明细表：增加【主体颜色】、【喷漆状态】、【出库口】，颜色和喷漆状态这两个字段取值为托盘内该物料实际的值 4.最下面的一行提示删除

feat:
2.主表：增加【喷漆状态】 3.明细表：增加【主体颜色】、【喷漆状态】、【出库口】，颜色和喷漆状态这两个字段取值为托盘内该物料实际的值 4.最下面的一行提示删除
易文鹏
1 parent a015635f
Showing 3 changed files with 41 additions and 2 deletions
src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentPrintVo.java
src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java
src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java
@@ -3,7 +3,10 @@ package com.huaheng.pc.shipment.shipmentHeader.domain;
 import com.huaheng.common.utils.DataUtils;
 import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
 import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
+import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
+import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
  
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -28,17 +31,23 @@ public class ShipmentPrintVo {
         data.warehouseName = shipmentHeader.getWarehouseName();
         data.transferWarehouseName = shipmentHeader.getTransferWarehouseName();
         data.remark = shipmentHeader.getShipmentNote();
+        data.paintStatus = shipmentHeader.getPaintStatus();//喷漆状态
         data.unionCode = unionCode;//合并单号
         data.recordCode = shipmentHeader.getRecordCode();//合并前单号
-        data.zoneInfo = zoneInfo;
-        data.materialColor = shipmentHeader.getMaterialColor();
+        data.zoneInfo = zoneInfo;//库区
+        data.materialColor = shipmentHeader.getMaterialColor();//颜色
         data.pageNumber = pageNumber;//页码
         if (shipmentHeader.getShipmentType().equals("208")) {
             data.footRight = "形态转换单据得重新维护编码，并重新入库";
         }
     }
  
+
+    @Resource
+    private TaskHeaderService taskHeaderService;
+
     public ShipDetail addShipDetail(TaskDetail taskDetail, String roadway) {
+        TaskHeader taskHeader = taskHeaderService.getById(taskDetail.getTaskId());
         ShipDetail voDetail = new ShipDetail();
         if (taskDetail.getFlat() == null || taskDetail.getFlat() != 1) {
             voDetail.containerCode = taskDetail.getContainerCode();
@@ -56,6 +65,9 @@ public class ShipmentPrintVo {
         voDetail.taskId = String.valueOf(taskDetail.getTaskId());
         voDetail.roadway = roadway;//巷道
         voDetail.recordCode = taskDetail.getRecordCode();//合并前单号
+        voDetail.port = taskHeader.getPort();//出库口
+        voDetail.materialColor = taskDetail.getMaterialColor();//颜色
+        voDetail.paintStatus = taskDetail.getPaintStatus();//喷漆状态
         data.details.add(voDetail);
         return voDetail;
     }
@@ -73,6 +85,8 @@ public class ShipmentPrintVo {
  
         //平库使用
         public String zoneInfo = "";
+        //喷漆状态
+        public String paintStatus = "";
         //生产车间
         public String workshop = "";
         //通知单号
@@ -105,6 +119,9 @@ public class ShipmentPrintVo {
         public String roadway = "";//巷道
         public String type = "";//任务类型
         public String recordCode = "";//合并前单号
+        public String paintStatus = "";//喷漆状态
+        public String materialColor = "";//颜色
+        public String port = "";//出库口
     }
  
 }
@@ -402,6 +402,18 @@ public class TaskDetail implements Serializable {
     @TableField(value = "inventoryTransactionId")
     private String inventoryTransactionId;
  
+    /**
+     * 物料颜色
+     */
+    @TableField(value = "materialColor")
+    @ApiModelProperty(value = "物料颜色")
+    public String materialColor;
+    /**
+     * 喷漆状态
+     */
+    @TableField(value = "paintStatus")
+    public String paintStatus;
+
     private static final long serialVersionUID = 1L;
  
     public void setQty(BigDecimal qty) {
@@ -241,6 +241,8 @@ public class ShipmentTaskService {
         }
         taskId = task.getId();
         for (ShipmentContainerDetail shipmentContainerDetail : shipmentContainerDetails) {
+            ShipmentHeader shipmentHeader = shipmentHeaderService.getOne(new LambdaQueryWrapper<ShipmentHeader>().eq(ShipmentHeader::getCode, shipmentContainerDetail.getShipmentCode()));
+
             TaskDetail taskDetail = new TaskDetail();
             //如果是平库
             if (container.getFlat() != null && container.getFlat() == 1) {
@@ -268,6 +270,14 @@ public class ShipmentTaskService {
             if (StringUtils.isNotEmpty(shipmentContainerDetail.getRecordCode())) {
                 taskDetail.setRecordCode(shipmentContainerDetail.getRecordCode());
             }
+            taskDetail.setMaterialColor(shipmentHeader.getMaterialColor());
+            taskDetail.setPaintStatus(shipmentHeader.getPaintStatus());
+            if (StringUtils.isEmpty(shipmentHeader.getMaterialColor())) {
+                taskDetail.setMaterialColor("");
+            }
+            if (StringUtils.isEmpty(shipmentHeader.getPaintStatus())) {
+                taskDetail.setPaintStatus("");
+            }
             taskDetail.setQty(shipmentContainerDetail.getQty());
             taskDetail.setContainerCode(task.getContainerCode());
             taskDetail.setFromLocation(task.getFromLocation());