选矿出库部分优化、加入wcs坐标字段

warewms-ams/src/main/java/com/ruoyi/ams/xuankuang/service/WmsDocOrderSubService.java

@@ -99,8 +99,9 @@ public class WmsDocOrderSubService {
         //出库单对应袋数
         int orderNum = list.get(0).getQtyOrderedEach().intValue();
         for (BaseLocationLotattVO baseLocationLotattVO1 : filterBaseLocationLotattVOS) {
+            String sku = baseLocationLotattVO1.getSku();
+            BaseSku baseSku = iBaseSkuService.selectBaseSkuByCustomerId(Constant.CUSTOMER_ID, sku);
 
-            BaseSku baseSku = iBaseSkuService.selectBaseSkuByCustomerId(Constant.CUSTOMER_ID, list.get(0).getSku());
             String pallentNo = baseLocationLotattVO1.getLotattVO().getLotatt07();
             String locationFrom = baseLocationLotattVO1.getLocationNo();
             String wcsNo = "wcs" + wcsTaskSubService.generateTaskNo();//生成唯一标识wcsno
@@ -109,21 +110,18 @@ public class WmsDocOrderSubService {
             String Y = baseLocationLotattVO1.getRowNo();
             String Z = baseLocationLotattVO1.getShiftNo();
             String X = baseLocationLotattVO1.getRowIndex();
-            String sku = baseLocationLotattVO1.getSku();
-            AjaxResult ajaxResult = new AjaxResult();
-            if (sku.equals("C4H9O2PSSNH4")) {
-                // 生成四向车出库任务
-                ajaxResult = wcsTaskSubService.addWcsOutTask(locationFrom, Constant.DRUM_CONNECTORS.toString(), orderNo, pallentNo, wcsNo);
-            } else {
-                // 生成四向车出库任务
-                ajaxResult = wcsTaskSubService.addWcsOutTask(locationFrom, Constant.LOC_SORTATION_CACHE.toString(), orderNo, pallentNo, wcsNo);
-            }
+            String wcsLocation = baseLocationLotattVO1.getUserdefine4();
+
+            String locationTO = sku.equals("C4H9O2PSSNH4") ? Constant.DRUM_CONNECTORS.toString() : Constant.LOC_SORTATION_CACHE.toString();
+            AjaxResult ajaxResult = wcsTaskSubService.addWcsOutTask(locationFrom, locationTO, orderNo, pallentNo, wcsNo);
+
             //调用出库任务下发接口
             OutTaskForm outTaskForm = new OutTaskForm();
             String taskNo = ajaxResult.get("data").toString();
             outTaskForm.setTaskNo(taskNo);
             outTaskForm.setRow(Integer.parseInt(X));
             outTaskForm.setCol(Integer.parseInt(Y));
+            outTaskForm.setWcsLocation(wcsLocation);
             outTaskForm.setFloor(Integer.parseInt(Z));
             outTaskForm.setPackageType(Integer.valueOf(baseSku.getSkuType()));
             outTaskForm.setMaterial(Integer.valueOf(baseSku.getDesc2()));