Merge remote-tracking branch 'origin/master'

ktg-mes/src/main/java/com/ktg/mes/md/controller/WmsOutTaskController.java

@@ -40,6 +40,11 @@ public class WmsOutTaskController extends BaseController {
         return getDataTable(list);
     }
 
+    @PutMapping("/open/run/{wmsOutTaskIds}")
+    public AjaxResult openRun(@PathVariable Long[] wmsOutTaskIds) {
+        return toAjax(wmsOutTaskService.runWmsOutTask(wmsOutTaskIds));
+    }
+
     /**
      * 查询出库任务列表
      */

ktg-mes/src/main/java/com/ktg/mes/wm/controller/UcmCtBaseController.java

@@ -91,6 +91,11 @@ public class UcmCtBaseController extends BaseController {
         }
     }
 
+    @PostMapping("/open/add")
+    public String openAdd(@RequestBody UcmCtBase ucmCtBase) {
+        return ucmCtBaseService.addUcmCtBase(ucmCtBase);
+    }
+
     /**
      * 查询料箱管理列表
      */

ktg-mes/src/main/java/com/ktg/mes/wm/service/IUcmCtBaseService.java

@@ -71,4 +71,6 @@ public interface IUcmCtBaseService
     String uploadTempBoxListInfo(List<RfidCard> rfidCardList);
 
     String uploadTempBoxItemListInfo(List<RfidCard> rfidCardList);
+
+    String addUcmCtBase(UcmCtBase ucmCtBase);
 }

ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/UcmCtBaseServiceImpl.java

@@ -262,4 +262,16 @@ public class UcmCtBaseServiceImpl implements IUcmCtBaseService {
         System.out.println("==============================================");
         return "OK";
     }
+
+    @Override
+    public String addUcmCtBase(UcmCtBase ucmCtBase) {
+        UcmCtBase ucmCtBaseQuery = new UcmCtBase();
+        ucmCtBaseQuery.setCode(ucmCtBase.getCode());
+        if (!ucmCtBaseMapper.selectUcmCtBaseList(ucmCtBaseQuery).isEmpty())
+            return "新增失败，该料箱已经存在";
+        ucmCtBase.setCreateTime(DateUtils.getNowDate());
+        ucmCtBase.setCreateBy(getUserName());
+        ucmCtBaseMapper.insertUcmCtBase(ucmCtBase);
+        return "OK";
+    }
 }