1

src/main/java/com/neotel/smfcore/custom/micron1053/task/MicronDispatchController.java

@@ -115,7 +115,7 @@ private IStoragePosManager storagePosManager;
         }
         }
         return dto;
         return dto;
     }
     }
-    @ApiOperation("获取出库页详情")
+    @ApiOperation("点 Outside Shelf Dispatch 或  Controlled Dispatch 按钮，调用此接口获取出库页详情")
     @AnonymousAccess
     @AnonymousAccess
     @GetMapping("/getList")
     @GetMapping("/getList")
     public ResultBean list(String mode) {
     public ResultBean list(String mode) {
@@ -175,7 +175,7 @@ private IStoragePosManager storagePosManager;
 
 
 
 
 
 
-    @ApiOperation("Submit")
+    @ApiOperation("Submit 选择工单文件后确认上传 mode=RACK时需要输入reason，mode=CTRLDISPATCH时reason传空字符串  ")
     @AnonymousAccess
     @AnonymousAccess
     @PostMapping("/submit")
     @PostMapping("/submit")
     public ResultBean outSideSubmit( @RequestParam MultipartFile orderFile,@RequestParam String mode,@RequestParam String reason ) {
     public ResultBean outSideSubmit( @RequestParam MultipartFile orderFile,@RequestParam String mode,@RequestParam String reason ) {
@@ -216,10 +216,10 @@ private IStoragePosManager storagePosManager;
     }
     }
 
 
 
 
-    @ApiOperation("controlledDisSure 输入lineID后确认调用此方法")
+    @ApiOperation("Controlled Dispatch 输入lineID后调用此方法")
     @AnonymousAccess
     @AnonymousAccess
     @PostMapping("/controlledDisSure")
     @PostMapping("/controlledDisSure")
-    public ResultBean controlledDisSure( @RequestParam String mode,@RequestParam String reason ) {
+    public ResultBean controlledDisSure( @RequestParam String mode,@RequestParam String lineId ) {
         //判断是否验证
         //判断是否验证
         if (!MicronApi.isEnable()) {
         if (!MicronApi.isEnable()) {
             return ResultBean.newErrorResult(9, "smfcore.micron.apiClose", " Not yet open");
             return ResultBean.newErrorResult(9, "smfcore.micron.apiClose", " Not yet open");
@@ -244,12 +244,12 @@ private IStoragePosManager storagePosManager;
             TaskDto dto = getTaskDtoByMode(mode);
             TaskDto dto = getTaskDtoByMode(mode);
 
 
             if (dto != null && ObjectUtil.isNotEmpty(dto.getOperationId())) {
             if (dto != null && ObjectUtil.isNotEmpty(dto.getOperationId())) {
-                dto.setLineId(reason);
+                dto.setLineId(lineId);
                 //调用API201
                 //调用API201
-                String result = MicronApi.Api201(reason, dto.getOperationId());
+                String result = MicronApi.Api201(lineId, dto.getOperationId());
                 if (ObjectUtil.isNotEmpty(result)) {
                 if (ObjectUtil.isNotEmpty(result)) {
                     //成功
                     //成功
-                    dto.setLineId(reason);
+                    dto.setLineId(lineId);
                     dataCache.updateCache(Constants.CACHE_DISPATCH + mode, dto);
                     dataCache.updateCache(Constants.CACHE_DISPATCH + mode, dto);
                     return ResultBean.newErrorResult(1, "", "");
                     return ResultBean.newErrorResult(1, "", "");
                 } else {
                 } else {
@@ -277,7 +277,7 @@ private IStoragePosManager storagePosManager;
         return ResultBean.newErrorResult(1, "", "");
         return ResultBean.newErrorResult(1, "", "");
     }
     }
 
 
-    @ApiOperation("Pn出库提交")
+    @ApiOperation("Controlled Dispatch ，勾选Pn出库提交")
     @AnonymousAccess
     @AnonymousAccess
     @PostMapping("/pnSubmit")
     @PostMapping("/pnSubmit")
     public ResultBean pnSubmit(@RequestBody Set< TacticsOutDto > outDtoSet) {
     public ResultBean pnSubmit(@RequestBody Set< TacticsOutDto > outDtoSet) {
@@ -350,7 +350,7 @@ private IStoragePosManager storagePosManager;
 
 
 
 
 
 
-    @ApiOperation("可用列表详情")
+    @ApiOperation("可用列表详情,点详情时，发送itemId，获取详细信息")
     @PostMapping("/itemDetial")
     @PostMapping("/itemDetial")
     @AnonymousAccess
     @AnonymousAccess
     public ResultBean itemDetial(@RequestBody Map<String,Object> params) {
     public ResultBean itemDetial(@RequestBody Map<String,Object> params) {
@@ -406,7 +406,7 @@ private IStoragePosManager storagePosManager;
 
 
 
 
 
 
-    @ApiOperation("勾选列表中的Ri")
+    @ApiOperation("勾选列表中的Ri，确认提交")
     @PostMapping("/itemSubmit")
     @PostMapping("/itemSubmit")
     @AnonymousAccess
     @AnonymousAccess
     public ResultBean itemSubmit(@RequestBody Map<String,Object> params) {
     public ResultBean itemSubmit(@RequestBody Map<String,Object> params) {
@@ -491,7 +491,7 @@ private IStoragePosManager storagePosManager;
 
 
 
 
 
 
-    @ApiOperation("确认出库")
+    @ApiOperation("工单确认出库")
     @PostMapping("/checkOut")
     @PostMapping("/checkOut")
     @AnonymousAccess
     @AnonymousAccess
     public ResultBean checkOut(@RequestBody Map<String,Object> params) {
     public ResultBean checkOut(@RequestBody Map<String,Object> params) {
@@ -513,7 +513,7 @@ private IStoragePosManager storagePosManager;
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");
     }
     }
 
 
-    @ApiOperation("重试")
+    @ApiOperation("重试按钮")
     @PostMapping("/retry")
     @PostMapping("/retry")
     @AnonymousAccess
     @AnonymousAccess
     public ResultBean retry(@RequestBody String mode) {
     public ResultBean retry(@RequestBody String mode) {

src/main/java/com/neotel/smfcore/custom/micron1053/task/bean/dto/DispatchItemDto.java

@@ -55,8 +55,10 @@ public class DispatchItemDto {
      * 库存盘数
      * 库存盘数
      */
      */
     private int inventoryReelCount = 0;
     private int inventoryReelCount = 0;
-
-
+    /**
+     * 执行
+     */
+    private String executFailReason;
     /**
     /**
      * 工单明细出库状态
      * 工单明细出库状态
      */
      */