no order 合并

src/main/java/com/gaotao/modules/customer/controller/ShipmentIssueController.java

@@ -1,6 +1,7 @@
 package com.gaotao.modules.customer.controller;
 
 import com.gaotao.common.utils.PageUtils;
+import com.gaotao.common.utils.PartAttributeUtil;
 import com.gaotao.common.utils.R;
 import com.gaotao.modules.api.entity.issueAndReturnVo.ShipmentLineVo;
 import com.gaotao.modules.api.entity.issueAndReturnVo.ShipmentVo;
@@ -28,6 +29,9 @@ public class ShipmentIssueController {
 
     @Autowired
     private ShipmentIssueService shipmentIssueService;
+    
+    @Autowired
+    private PartAttributeUtil partAttributeUtil;
 
     /**
      * @Description 获取用户下面未下达领料申请单
@@ -107,6 +111,17 @@ public class ShipmentIssueController {
     @ResponseBody
     public R searchUnissueNotifyMaterialList(@RequestBody SOIssueNotifyOrderList data){
         List<SOIssueNotifyOrderMaterialListShipmentVo> rows = shipmentIssueService.searchUnissueNotifyMaterialList(data);
+        
+        // 填充字段：将componentPartNo赋值给partNo - rqrq
+        if (rows != null && rows.size() > 0) {
+            for (SOIssueNotifyOrderMaterialListShipmentVo row : rows) {
+                row.setPartNo(row.getComponentPartNo());
+            }
+            
+            // 批量填充isInWh字段 - rqrq
+            partAttributeUtil.fillIsInWh(rows);
+        }
+        
         return R.ok().put("rows", rows);
     }
 
@@ -231,6 +246,15 @@ public class ShipmentIssueController {
         //TODO 调用rifs接口获取列表数据
         List<ShipmentAndShipmentLineVo> rows = shipmentIssueService.getShipmentAndLineForIssure(data);
         if(rows != null && rows.size() > 0){
+            // 填充字段：将contract赋值给site，将inventoryPartNo赋值给partNo - rqrq
+            for (ShipmentAndShipmentLineVo row : rows) {
+                row.setSite(row.getContract());
+                row.setPartNo(row.getInventoryPartNo());
+            }
+            
+            // 批量填充isInWh字段 - rqrq
+            partAttributeUtil.fillIsInWh(rows);
+            
             return R.ok().put("rows", rows);
         }
         return R.error("未找到对应的SHIPMENT物料信息");

src/main/java/com/gaotao/modules/customer/entity/vo/SOIssueNotifyOrderMaterialListShipmentVo.java

@@ -1,16 +1,27 @@
 package com.gaotao.modules.customer.entity.vo;
 
+import com.gaotao.common.utils.PartAttributeAware;
 import com.gaotao.modules.notify.entity.SOIssueNotifyOrderMaterialList;
 import lombok.Data;
 
 import java.math.BigDecimal;
 
+/**
+ * @Description 销售发货申请单物料明细VO - rqrq
+ * @Author rqrq
+ * @Date 2025/11/25
+ */
 @Data
-public class SOIssueNotifyOrderMaterialListShipmentVo extends SOIssueNotifyOrderMaterialList {
+public class SOIssueNotifyOrderMaterialListShipmentVo extends SOIssueNotifyOrderMaterialList implements PartAttributeAware {
     private BigDecimal qtyOnHand;
     private String uom;
     private String componentPartDesc;
     
+    /**
+     * 料号（用于PartAttributeAware接口，与componentPartNo保持一致）- rqrq
+     */
+    private String partNo;
+    
     /**
      * 是否进立库 (Y/N/未维护) - rqrq
      */

src/main/java/com/gaotao/modules/customer/entity/vo/ShipmentAndShipmentLineVo.java

@@ -1,6 +1,7 @@
 package com.gaotao.modules.customer.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.gaotao.common.utils.PartAttributeAware;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -8,8 +9,13 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Date;
 
+/**
+ * @Description 销售发货单及明细VO - rqrq
+ * @Author rqrq
+ * @Date 2025/11/25
+ */
 @Data
-public class ShipmentAndShipmentLineVo {
+public class ShipmentAndShipmentLineVo implements PartAttributeAware {
     /*------------------------------------line数据------------------------------------------------*/
     private String sourceRef1;
 
@@ -151,7 +157,19 @@ public class ShipmentAndShipmentLineVo {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date plannedDeliveryDate;
-
-
-
+    
+    /**
+     * 站点（用于PartAttributeAware接口，与contract保持一致）- rqrq
+     */
+    private String site;
+    
+    /**
+     * 料号（用于PartAttributeAware接口，与inventoryPartNo保持一致）- rqrq
+     */
+    private String partNo;
+    
+    /**
+     * 是否进立库 (Y/N/未维护) - rqrq
+     */
+    private String isInWh;
 }