Merge remote-tracking branch 'origin/xuankuang' into xuankuang

ruoyi-admin/src/main/java/com/ruoyi/init/StartService.java

@@ -10,6 +10,7 @@ import com.ruoyi.ams.config.domain.dto.LotattDTO;
 import com.ruoyi.base.constant.Constant;
 import com.ruoyi.base.domain.BaseLocationInfo;
 import com.ruoyi.base.service.IBaseLocationInfoService;
+import com.ruoyi.hard.xuankang.StirringTankClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
@@ -34,6 +35,8 @@ public class StartService implements CommandLineRunner {
     private AutoButtonBoxTask autoButtonBoxTask;
     @Autowired
     private IBaseLocationInfoService baseLocationInfoService;
+    @Autowired
+    private StirringTankClient stirringTankClient;
 
     @Override
     public void run(String... args) throws Exception {
@@ -49,4 +52,18 @@ public class StartService implements CommandLineRunner {
             thread.start();
         }
     }
+
+    /**
+     * 与搅拌槽的通讯心跳
+     */
+    public void communicationHeartbeat() throws InterruptedException {
+        stirringTankClient.writeTank01_6();
+    }
+
+    /**
+     * 与搅拌槽的通讯心跳
+     */
+    public void communicationHeartbeat1() throws InterruptedException {
+        stirringTankClient.writeTank01_7();
+    }
 }

warewms-ams/src/main/java/com/ruoyi/ams/xuankuang/domain/form/BillTaskForm.java

@@ -21,7 +21,7 @@ public class BillTaskForm {
      *
      * 枚举: 1,2
      *
-     * 枚举备注: 1袋装 2桶装
+     * 枚举备注: 1桶装 2袋装
      */
     private Integer packageType;
     /**

warewms-ams/src/main/java/com/ruoyi/ams/xuankuang/domain/form/OutTaskForm.java

@@ -1,5 +1,7 @@
 package com.ruoyi.ams.xuankuang.domain.form;
 
+import java.util.List;
+
 /**
  * @author JWK
  * @version 1.0
@@ -42,12 +44,17 @@ public class OutTaskForm {
      * docNo：回库关联单据号
      */
     private String docNo;
+
+    public void setDests(List<Dest> dests) {
+        this.dests = dests;
+    }
+
     /**
      * dests：桶装物资不需要
      * dest：破袋机编号
      * num：袋数
      */
-    private Dest[] dests;
+    private List<Dest> dests;
 
     public static class Dest {
         private Integer dest;

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

@@ -1,5 +1,6 @@
 package com.ruoyi.ams.xuankuang.service;
 
+import com.alibaba.fastjson.JSON;
 import com.ruoyi.ams.asn.domain.WmsDocAsnDetails;
 import com.ruoyi.ams.asn.domain.WmsDocAsnHeader;
 import com.ruoyi.ams.asn.service.IWmsDocAsnHeaderService;
@@ -124,6 +125,12 @@ public class WmsDocOrderSubService {
             outTaskForm.setMaterial(Integer.valueOf(baseSku.getDesc2()));
             outTaskForm.setTotal(list.get(0).getQtyOrderedEach().intValue());
             outTaskForm.setDocNo(orderNo);
+            List<OutTaskForm.Dest> dests = new ArrayList<>();
+            OutTaskForm.Dest dest = new OutTaskForm.Dest();
+            dest.setDest(Integer.parseInt(wmsDocOrderHeader.getSoReference3()));
+            dest.setNum(list.get(0).getQtyOrdered().intValue());
+            dests.add(dest);
+            outTaskForm.setDests(dests);
             WcsResponseVo wcsResponseVo = wmsToWcsApiService.wmsOutTask(outTaskForm);
             if (!wcsResponseVo.isSuccess()) {
                 con = false;

warewms-hard/src/main/java/com/ruoyi/hard/xuankang/ConvertUtil.java

@@ -13,6 +13,15 @@ public class ConvertUtil {
         //转换为bool数组
         int i = num.intValue();
         String string = Integer.toBinaryString(i);
+        int StrLength = string.length();
+        if (StrLength < 16) {
+            while (StrLength < 16) {
+                StringBuilder stringBuilder = new StringBuilder();
+                String stringNew = stringBuilder.append("0").append(string).toString();
+                StrLength = stringNew.length();
+                string = stringNew;
+            }
+        }
         char[] chars = string.toCharArray();
         boolean[] booleans = new boolean[16];
         for (int j = 0; j < chars.length; j++) {
@@ -33,7 +42,7 @@ public class ConvertUtil {
     }
 
     public static void main(String[] args) {
-        boolean[] booleans = {true,true,true,true,true,true,true,true};
+        boolean[] booleans = {true, true, true, true, true, true, true, true};
         System.out.println(ConvertUtil.convertToInt(booleans));
 
         int num = 124;

warewms-hard/src/main/java/com/ruoyi/hard/xuankang/StirringTankClient.java

@@ -310,12 +310,37 @@ public class StirringTankClient {
      * @return
      */
     public Boolean writeTank01() {
+        Number number = read1(READ_THE_REPOSITORY_01.getSlaveId(), READ_THE_REPOSITORY_01.getOffset());
+        boolean[] booleans = ConvertUtil.convertToBooleans(number);
+        booleans[15] = true;
+        int i = ConvertUtil.convertToInt(booleans);
+        return write(WRITE_THE_STIRRING_TANK_01.getSlaveId(), WRITE_THE_STIRRING_TANK_01.getOffset(), i);
+    }
+
+    /**
+     * 通讯心跳
+     *
+     * @return
+     */
+    public Boolean writeTank01_6() throws InterruptedException {
         Number number = read1(READ_THE_REPOSITORY_01.getSlaveId(), READ_THE_REPOSITORY_01.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
         booleans[0] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_01.getSlaveId(), WRITE_THE_STIRRING_TANK_01.getOffset(), i);
     }
+    /**
+     * 通讯心跳
+     *
+     * @return
+     */
+    public Boolean writeTank01_7() throws InterruptedException {
+        Number number = read1(READ_THE_REPOSITORY_01.getSlaveId(), READ_THE_REPOSITORY_01.getOffset());
+        boolean[] booleans = ConvertUtil.convertToBooleans(number);
+        booleans[0] = false;
+        int i = ConvertUtil.convertToInt(booleans);
+        return write(WRITE_THE_STIRRING_TANK_01.getSlaveId(), WRITE_THE_STIRRING_TANK_01.getOffset(), i);
+    }
 
     /**
      * 写仓库无法完成丁黄药注药量
@@ -325,7 +350,7 @@ public class StirringTankClient {
     public Boolean writeTank01_1() {
         Number number = read1(READ_THE_REPOSITORY_01.getSlaveId(), READ_THE_REPOSITORY_01.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[1] = true;
+        booleans[14] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_01.getSlaveId(), WRITE_THE_STIRRING_TANK_01.getOffset(), i);
     }
@@ -338,7 +363,7 @@ public class StirringTankClient {
     public Boolean writeTank01_2() {
         Number number = read1(READ_THE_REPOSITORY_01.getSlaveId(), READ_THE_REPOSITORY_01.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[2] = true;
+        booleans[13] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_01.getSlaveId(), WRITE_THE_STIRRING_TANK_01.getOffset(), i);
     }
@@ -351,7 +376,7 @@ public class StirringTankClient {
     public Boolean writeTank01_3() {
         Number number = read1(READ_THE_REPOSITORY_01.getSlaveId(), READ_THE_REPOSITORY_01.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[3] = true;
+        booleans[12] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_01.getSlaveId(), WRITE_THE_STIRRING_TANK_01.getOffset(), i);
     }
@@ -364,7 +389,7 @@ public class StirringTankClient {
     public Boolean writeTank01_4() {
         Number number = read1(READ_THE_REPOSITORY_01.getSlaveId(), READ_THE_REPOSITORY_01.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[4] = true;
+        booleans[11] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_01.getSlaveId(), WRITE_THE_STIRRING_TANK_01.getOffset(), i);
     }
@@ -377,7 +402,7 @@ public class StirringTankClient {
     public Boolean writeTank01_5() {
         Number number = read1(READ_THE_REPOSITORY_01.getSlaveId(), READ_THE_REPOSITORY_01.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[5] = true;
+        booleans[10] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_01.getSlaveId(), WRITE_THE_STIRRING_TANK_01.getOffset(), i);
     }
@@ -390,7 +415,7 @@ public class StirringTankClient {
     public Boolean writeTank02() {
         Number number = read1(READ_THE_REPOSITORY_02.getSlaveId(), READ_THE_REPOSITORY_02.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[0] = true;
+        booleans[15] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_02.getSlaveId(), WRITE_THE_STIRRING_TANK_02.getOffset(), i);
     }
@@ -403,7 +428,7 @@ public class StirringTankClient {
     public Boolean writeTank02_1() {
         Number number = read1(READ_THE_REPOSITORY_02.getSlaveId(), READ_THE_REPOSITORY_02.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[1] = true;
+        booleans[14] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_02.getSlaveId(), WRITE_THE_STIRRING_TANK_02.getOffset(), i);
     }
@@ -416,7 +441,7 @@ public class StirringTankClient {
     public Boolean writeTank02_2() {
         Number number = read1(READ_THE_REPOSITORY_02.getSlaveId(), READ_THE_REPOSITORY_02.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[2] = true;
+        booleans[13] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_02.getSlaveId(), WRITE_THE_STIRRING_TANK_02.getOffset(), i);
     }
@@ -429,7 +454,7 @@ public class StirringTankClient {
     public Boolean writeTank02_3() {
         Number number = read1(READ_THE_REPOSITORY_02.getSlaveId(), READ_THE_REPOSITORY_02.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[3] = true;
+        booleans[12] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_02.getSlaveId(), WRITE_THE_STIRRING_TANK_02.getOffset(), i);
     }
@@ -442,7 +467,7 @@ public class StirringTankClient {
     public Boolean writeTank02_4() {
         Number number = read1(READ_THE_REPOSITORY_02.getSlaveId(), READ_THE_REPOSITORY_02.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[4] = true;
+        booleans[11] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_02.getSlaveId(), WRITE_THE_STIRRING_TANK_02.getOffset(), i);
     }
@@ -455,7 +480,7 @@ public class StirringTankClient {
     public Boolean writeTank02_5() {
         Number number = read1(READ_THE_REPOSITORY_02.getSlaveId(), READ_THE_REPOSITORY_02.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[5] = true;
+        booleans[10] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_02.getSlaveId(), WRITE_THE_STIRRING_TANK_02.getOffset(), i);
     }
@@ -468,7 +493,7 @@ public class StirringTankClient {
     public Boolean writeTank03() {
         Number number = read1(READ_THE_REPOSITORY_03.getSlaveId(), READ_THE_REPOSITORY_03.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[0] = true;
+        booleans[15] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_03.getSlaveId(), WRITE_THE_STIRRING_TANK_03.getOffset(), i);
     }
@@ -481,7 +506,7 @@ public class StirringTankClient {
     public Boolean writeTank03_1() {
         Number number = read1(READ_THE_REPOSITORY_03.getSlaveId(), READ_THE_REPOSITORY_03.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[1] = true;
+        booleans[14] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_03.getSlaveId(), WRITE_THE_STIRRING_TANK_03.getOffset(), i);
     }
@@ -494,7 +519,7 @@ public class StirringTankClient {
     public Boolean writeTank03_2() {
         Number number = read1(READ_THE_REPOSITORY_03.getSlaveId(), READ_THE_REPOSITORY_03.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[2] = true;
+        booleans[13] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_03.getSlaveId(), WRITE_THE_STIRRING_TANK_03.getOffset(), i);
     }
@@ -507,7 +532,7 @@ public class StirringTankClient {
     public Boolean writeTank03_3() {
         Number number = read1(READ_THE_REPOSITORY_03.getSlaveId(), READ_THE_REPOSITORY_03.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[3] = true;
+        booleans[12] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_03.getSlaveId(), WRITE_THE_STIRRING_TANK_03.getOffset(), i);
     }
@@ -520,7 +545,7 @@ public class StirringTankClient {
     public Boolean writeTank03_4() {
         Number number = read1(READ_THE_REPOSITORY_03.getSlaveId(), READ_THE_REPOSITORY_03.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[4] = true;
+        booleans[11] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_03.getSlaveId(), WRITE_THE_STIRRING_TANK_03.getOffset(), i);
     }
@@ -533,7 +558,7 @@ public class StirringTankClient {
     public Boolean writeTank03_5() {
         Number number = read1(READ_THE_REPOSITORY_03.getSlaveId(), READ_THE_REPOSITORY_03.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[5] = true;
+        booleans[10] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_03.getSlaveId(), WRITE_THE_STIRRING_TANK_03.getOffset(), i);
     }
@@ -546,7 +571,7 @@ public class StirringTankClient {
     public Boolean writeTank04() {
         Number number = read1(READ_THE_REPOSITORY_04.getSlaveId(), READ_THE_REPOSITORY_04.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[0] = true;
+        booleans[15] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_04.getSlaveId(), WRITE_THE_STIRRING_TANK_04.getOffset(), i);
     }
@@ -559,7 +584,7 @@ public class StirringTankClient {
     public Boolean writeTank04_1() {
         Number number = read1(READ_THE_REPOSITORY_04.getSlaveId(), READ_THE_REPOSITORY_04.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[1] = true;
+        booleans[14] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_04.getSlaveId(), WRITE_THE_STIRRING_TANK_04.getOffset(), i);
     }
@@ -572,7 +597,7 @@ public class StirringTankClient {
     public Boolean writeTank04_2() {
         Number number = read1(READ_THE_REPOSITORY_04.getSlaveId(), READ_THE_REPOSITORY_04.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[2] = true;
+        booleans[13] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_04.getSlaveId(), WRITE_THE_STIRRING_TANK_04.getOffset(), i);
     }
@@ -585,7 +610,7 @@ public class StirringTankClient {
     public Boolean writeTank04_3() {
         Number number = read1(READ_THE_REPOSITORY_04.getSlaveId(), READ_THE_REPOSITORY_04.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[3] = true;
+        booleans[12] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_04.getSlaveId(), WRITE_THE_STIRRING_TANK_04.getOffset(), i);
     }
@@ -598,7 +623,7 @@ public class StirringTankClient {
     public Boolean writeTank04_4() {
         Number number = read1(READ_THE_REPOSITORY_04.getSlaveId(), READ_THE_REPOSITORY_04.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[4] = true;
+        booleans[11] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_04.getSlaveId(), WRITE_THE_STIRRING_TANK_04.getOffset(), i);
     }
@@ -611,7 +636,7 @@ public class StirringTankClient {
     public Boolean writeTank04_5() {
         Number number = read1(READ_THE_REPOSITORY_04.getSlaveId(), READ_THE_REPOSITORY_04.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[5] = true;
+        booleans[10] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_04.getSlaveId(), WRITE_THE_STIRRING_TANK_04.getOffset(), i);
     }
@@ -624,7 +649,7 @@ public class StirringTankClient {
     public Boolean writeTank05() {
         Number number = read1(READ_THE_REPOSITORY_05.getSlaveId(), READ_THE_REPOSITORY_05.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[0] = true;
+        booleans[15] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_05.getSlaveId(), WRITE_THE_STIRRING_TANK_05.getOffset(), i);
     }
@@ -637,7 +662,7 @@ public class StirringTankClient {
     public Boolean writeTank05_1() {
         Number number = read1(READ_THE_REPOSITORY_05.getSlaveId(), READ_THE_REPOSITORY_05.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[1] = true;
+        booleans[14] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_05.getSlaveId(), WRITE_THE_STIRRING_TANK_05.getOffset(), i);
     }
@@ -650,7 +675,7 @@ public class StirringTankClient {
     public Boolean writeTank05_2() {
         Number number = read1(READ_THE_REPOSITORY_05.getSlaveId(), READ_THE_REPOSITORY_05.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[2] = true;
+        booleans[13] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_05.getSlaveId(), WRITE_THE_STIRRING_TANK_05.getOffset(), i);
     }
@@ -663,7 +688,7 @@ public class StirringTankClient {
     public Boolean writeTank05_3() {
         Number number = read1(READ_THE_REPOSITORY_05.getSlaveId(), READ_THE_REPOSITORY_05.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[3] = true;
+        booleans[12] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_05.getSlaveId(), WRITE_THE_STIRRING_TANK_05.getOffset(), i);
     }
@@ -676,7 +701,7 @@ public class StirringTankClient {
     public Boolean writeTank05_4() {
         Number number = read1(READ_THE_REPOSITORY_05.getSlaveId(), READ_THE_REPOSITORY_05.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[4] = true;
+        booleans[11] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_05.getSlaveId(), WRITE_THE_STIRRING_TANK_05.getOffset(), i);
     }
@@ -689,7 +714,7 @@ public class StirringTankClient {
     public Boolean writeTank05_5() {
         Number number = read1(READ_THE_REPOSITORY_05.getSlaveId(), READ_THE_REPOSITORY_05.getOffset());
         boolean[] booleans = ConvertUtil.convertToBooleans(number);
-        booleans[5] = true;
+        booleans[10] = true;
         int i = ConvertUtil.convertToInt(booleans);
         return write(WRITE_THE_STIRRING_TANK_05.getSlaveId(), WRITE_THE_STIRRING_TANK_05.getOffset(), i);
     }