入库任务调用wms参数调整

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/externalApi/service/impl/WmsAgvInfoServiceImpl.java

@@ -177,6 +177,7 @@ public class WmsAgvInfoServiceImpl extends SuperCacheServiceImpl<WmsAgvInfoMappe
             ViewStockGoods goodsByMaterialCode = stockInfoMapper.getGoodsByMaterialCode(vo.getMaterialCode());
             vo.setMeterialId(goodsByMaterialCode.getId());
             vo.setWmsAgvInfoId(wmsAgvInfo.getId());
+            vo.setGoodsType(goodsByMaterialCode.getCategory());
             //终点入库
             if(endStorge!=null){
                 StockInfo stockInfo=new StockInfo();
@@ -286,12 +287,33 @@ public class WmsAgvInfoServiceImpl extends SuperCacheServiceImpl<WmsAgvInfoMappe
             wmsRequestDto.setPriority(1);
             wmsRequestDto.setZoneId(1967459191408820224L);
 
+            // trayNo
+            String trayNo = wmsAgvInfoDetails.stream()
+                    .filter(s -> "1".equals(s.getGoodsType()))
+                    .map(WmsAgvInfoDetail::getGoodsType)   // 假设 trayNo 存在于 goodsCode 字段
+                    .findFirst()
+                    .orElse(null);
+
+            // boxNo
+            String boxNo = wmsAgvInfoDetails.stream()
+                    .filter(s -> "7".equals(s.getGoodsType()))
+                    .map(WmsAgvInfoDetail::getGoodsType)   // 假设 boxNo 存在于 goodsCode 字段
+                    .findFirst()
+                    .orElse(null);
+
+            // 过滤掉 1 和 7
+            List<WmsAgvInfoDetail> otherList = wmsAgvInfoDetails.stream()
+                    .filter(s -> "1".equals(s.getGoodsType()) && "7".equals(s.getGoodsType()))
+                    .collect(java.util.stream.Collectors.toList());
+
             List<WmsMaterialDto> materialDtoList=new ArrayList<>();
-            wmsAgvInfoDetails.stream().forEach(vo->{
+            otherList.stream().forEach(vo->{
                 WmsMaterialDto wmsMaterialDto=new WmsMaterialDto();
                 wmsMaterialDto.setQuantity(vo.getQty());
                 wmsMaterialDto.setMaterialName(vo.getMaterialName());
                 wmsMaterialDto.setMaterialCode(vo.getMaterialCode());
+                wmsMaterialDto.setTrayNo(trayNo);
+                wmsMaterialDto.setBoxNo(boxNo);
                 materialDtoList.add(wmsMaterialDto);
             });
 

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/externalApi/entity/WmsAgvInfoDetail.java

@@ -78,6 +78,9 @@ public class WmsAgvInfoDetail extends Entity<Long> {
     @Excel(name = "meterial_id")
     private Long meterialId;
 
+    @TableField(value = "goods_type")
+    private String goodsType;
+
     //托盘编码
     @TableField("tray_no")
     private String trayNo;