提交

wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java

@@ -78,14 +78,13 @@ public class AcsToWmsController {
     @Log("排产单确认")
     @ApiOperation("排产单确认")
     public ResponseEntity<Object> sureProduceTask(@RequestBody Map whereJson) {
-        acsToWmsService.sureProduceTask(whereJson);
+        return new ResponseEntity<>(acsToWmsService.sureProduceTask(whereJson), HttpStatus.OK);
-        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @PostMapping("/status")
     @Log("ACS给WMS反馈任务状态")
     @ApiOperation("ACS给WMS反馈任务状态")
-    public ResponseEntity<Object> receiveTaskStatusAcs(@RequestBody String  string) {
+    public ResponseEntity<Object> receiveTaskStatusAcs(@RequestBody String string) {
         return new ResponseEntity<>(acsToWmsService.receiveTaskStatusAcs(string), HttpStatus.OK);
     }
 }

wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java

@@ -5,7 +5,7 @@ import java.util.Map;
 public interface AcsToWmsService {
 
     /**
-     * ACS客户端--->WMS服务端
+     * ACS客户端--->WMS服务
      * ACS向WMS申请任务
      *
      * @param jsonObject 条件
@@ -61,7 +61,7 @@ public interface AcsToWmsService {
      * @return Map<String, Object>
      */
 
-    void sureProduceTask(Map jsonObject);
+    Map<String, Object> sureProduceTask(Map jsonObject);
     /**
      * ACS客户端--->WMS服务端
      * ACS向WMS反馈任务状态

wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -310,7 +310,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
     }
 
     @Override
-    public void sureProduceTask(Map jsonObject) {
+    public  Map<String, Object> sureProduceTask(Map jsonObject) {
         String producetask_code = (String) jsonObject.get("producetask_code");
         String device_code = (String) jsonObject.get("device_code");
         String material_code = (String) jsonObject.get("material_code");
@@ -356,6 +356,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             taskObj.put("real_qty",qty);
         }
         taskTable.update(taskObj);
+        JSONObject result = new JSONObject();
+        result.put("status", HttpStatus.OK.value());
+        result.put("message", "任务状态反馈成功!");
+        result.put("data", new JSONObject());
+        return result;
     }
 
     @Override

wms/hd/nladmin-system/src/test/java/org/nl/Test3.java

@@ -13,6 +13,8 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Queue;
+import java.util.concurrent.ArrayBlockingQueue;
 
 public class Test3 extends BaseTest {
     @org.junit.Test
@@ -263,4 +265,15 @@ public class Test3 extends BaseTest {
             }
         }
     }
+    public static void main(String[] args) {
+        Queue<String> ma = new ArrayBlockingQueue<>(10);
+        for (int i = 0; i <5 ; i++) {
+            ma.offer("pla00"+i);
+        }
+        ma.poll();
+        for (String str:ma){
+            System.out.println(str);
+        }
+        System.out.println(ma.size());
+    }
 }