显示九宫格

src/main/java/com/gaotao/modules/api/entity/PalletStationVo.java

@@ -7,6 +7,6 @@ import java.util.List;
 @Data
 public class PalletStationVo {
     private Integer position;  //点位
-    private Integer layer;   //层数
+        private Integer layer;   //层数
     List<PalletStationDetailVo> productInfos;//明细
 }

src/main/java/com/gaotao/modules/api/entity/PushPalletDetailDto.java

@@ -17,7 +17,7 @@ public class PushPalletDetailDto {
     private Integer soreType;//分拣方式  0人工  1气胀轴  2抱箱
     private String assemblyPosition;//托盘码
     private List<PalletStationVo> cargoInfos;//明细数据
-
+    private PartTypeEnum partType;
     public String getSite() {
         return site;
     }
@@ -105,4 +105,12 @@ public class PushPalletDetailDto {
     public void setCargoInfos(List<PalletStationVo> cargoInfos) {
         this.cargoInfos = cargoInfos;
     }
+
+    public PartTypeEnum getPartType() {
+        return partType;
+    }
+
+    public void setPartType(PartTypeEnum partType) {
+        this.partType = partType;
+    }
 }

src/main/java/com/gaotao/modules/api/service/impl/WcsApiServiceImpl.java

@@ -149,6 +149,7 @@ public class WcsApiServiceImpl implements WcsApiService {
 
         // 3. 构造请求参数
         Map<String, Object> request = Map.of("taskNo", inData.getTaskNo(),
+                "itemNo", inData.getItemNo(),
                 "palletId", inData.getPalletId());
         Long logId = null;
 

src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java

@@ -838,6 +838,8 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService {
         String autoSort = palletInfo.getAutoSort();
         boolean isAutoSort = "Y".equals(autoSort);
 
+
+
         //获取栈板里面增量数据
         List<PalletDetailData> newDetail=wcsIntegrationMapper.getPalletDetailsNewDetail(site, palletId);
         if(newDetail.isEmpty()){
@@ -847,6 +849,15 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService {
         boolean hasCommonlyUsed = newDetail.stream()
                 .anyMatch(pallet -> "Y".equals(pallet.getIsCommonlyUsed()));
         PushPalletDetailDto inData= new PushPalletDetailDto();
+        if("A01".equals(palletInfo.getPalletFamily())){
+            inData.setPartType(PartTypeEnum.fromCode(2));
+        }else if("A02".equals(palletInfo.getPalletFamily())){
+            inData.setPartType(PartTypeEnum.fromCode(1));
+        }else if("A03".equals(palletInfo.getPalletFamily())){
+            inData.setPartType(PartTypeEnum.fromCode(0));
+        }else{
+            inData.setPartType(PartTypeEnum.fromCode(3));
+        }
         inData.setSite(site);
         inData.setTaskNo(taskNo);
         inData.setItemNo(itemNo);

src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java

@@ -160,7 +160,7 @@ public class WcsTaskServiceImpl implements WcsTaskService {
             log.info("立库调栈板任务处理成功：taskNo={}, result={}", orderTask.getTaskNo(), result);
             
             // 4. 更新任务状态为已完成
-            wcsIntegrationMapper.updateOrderTaskStatusAndWmsStatus(orderTask.getId(), "已完成", "WCS调用成功");
+            wcsIntegrationMapper.updateOrderTaskStatusAndWmsStatus(orderTask.getId(), "已下达", "WCS调用成功");
             
         } catch (Exception e) {
             log.error("处理立库调栈板任务失败：taskNo={}, error={}", orderTask.getTaskNo(), e.getMessage());