功能优化

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -509,7 +509,7 @@ public class StoragePosController {
         String box = criteria.getBox();
         String partNumber = criteria.getPartNumber();
         if (StringUtils.isBlank(stationName)) {
-            return ResultBean.newErrorResult(-1, "", "请选择对应的工位");
+            return ResultBean.newErrorResult(-1, "", "请选择对应的位置");
         }
         if (StringUtils.isBlank(partNumber)
                 && StringUtils.isBlank(provider)
@@ -587,8 +587,11 @@ public class StoragePosController {
                         //保存信息
                         barcode = barcodeManager.save(barcode);
                         pidBarcode.UpdateSubCode(barcode);
-                        barcodeManager.saveBarcode(pidBarcode);
                     }
+
+                    barcodeManager.saveBarcode(pidBarcode);
+                    pos.setBarcode(pidBarcode);
+                    storagePosManager.save(pos);
                 }
 
                 if (hasOutReel) {

src/main/java/com/neotel/smfcore/core/system/rest/TaskController.java

@@ -115,6 +115,7 @@ public class TaskController {
                 headerList.add(Lists.newArrayList("类型"));
                 headerList.add(Lists.newArrayList("来源"));
                 headerList.add(Lists.newArrayList("状态"));
+                headerList.add(Lists.newArrayList("当前位置"));
                 headerList.add(Lists.newArrayList("操作人"));
                 headerList.add(Lists.newArrayList("创建时间"));
                 headerList.add(Lists.newArrayList("更新时间"));
@@ -134,6 +135,7 @@ public class TaskController {
                     result.add(dataLog.getType() == 1 ? "入库" : "出库");
                     result.add(dataLog.getSourceName());
                     result.add(dataLog.getStatus());
+                    result.add(dataLog.getCurrentLoc());
                     result.add(dataLog.getCreator());
                     result.add(dataLog.getCreateDate());
                     result.add(dataLog.getUpdateDate());

src/main/java/com/neotel/smfcore/core/system/rest/bean/dto/TaskDto.java

@@ -146,6 +146,9 @@ public class TaskDto implements Serializable {
     @ApiModelProperty("出口位置")
     private String export = "";
 
+    @ApiModelProperty("当前位置")
+    private String currentLoc = "";
+
     public String getTaskColor() {
         if (ObjectUtil.isNotEmpty(lightColor)) {
             return "#" + lightColor;

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CDeviceController.java

@@ -642,10 +642,10 @@ public class CDeviceController {
     @ApiOperation("呼叫空箱")
     @RequestMapping("/callEmptyBox")
     @AnonymousAccess
-    public ResultBean callEmptyBox(String size, String outLet, String wareHouseCode) {
-        log.info("开始呼叫空箱,尺寸为:" + size + ",出口位置为:" + outLet);
+    public ResultBean callEmptyBox(String size, String outLet, String warehouseCode) {
+        log.info("开始呼叫空箱,尺寸为:" + size + ",出口位置为:" + outLet+",库别为:"+warehouseCode);
 
-        StoragePos storagePos = BoxHandleUtil.callEmptyBox(size, outLet, wareHouseCode,new ArrayList<>());
+        StoragePos storagePos = BoxHandleUtil.callEmptyBox(size, outLet, warehouseCode,new ArrayList<>());
         if (storagePos == null) {
             return ResultBean.newErrorResult(-1, "", "未找到可用料箱");
         }

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/StorTransferController.java

@@ -47,16 +47,16 @@ public class StorTransferController {
         log.info("储位移转信息为:" + JSON.toJSONString(paramMap));
 
         String materialStr = paramMap.get("materialStr");
-        String warehouseCode = paramMap.get("warehouseCode");
+        //String warehouseCode = paramMap.get("warehouseCode");
         String codeStr = paramMap.get("codeStr");
 
         if (StringUtils.isEmpty(materialStr)) {
             return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"料串信息"});
         }
 
-        if (StringUtils.isEmpty(warehouseCode)) {
+        /*if (StringUtils.isEmpty(warehouseCode)) {
             return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"库别信息"});
-        }
+        }*/
 
         //判断料串信息是否正确
         if (StringUtils.isEmpty(materialStr) || !materialStr.startsWith("B00")) {
@@ -74,6 +74,11 @@ public class StorTransferController {
             return ResultBean.newErrorResult(-1, "smfcore.error.barcode.noValidCode", "条码无效");
         }
 
+        String warehouseCode = barcode.getWarehouseCode();
+        if (StringUtils.isEmpty(warehouseCode)) {
+            return ResultBean.newErrorResult(-1, "", "未找到"+barcode.getBarcode()+"的库别信息");
+        }
+
         //获取尺寸信息
         BrandQtyResult result = LuxsanApi.brandQtyUrl(new BrandQtyRequest(barcode.getPartNumber(), barcode.getProvider()));
         if (result == null) {