复称数据展示完善

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/test/ModbusTestController.java

@@ -1,13 +1,15 @@
 package com.ruoyi.web.controller.warewms.test;
 
+import com.ruoyi.ams.inv.service.IInvLotLocIdService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.hard.modbus.tcp.ModbusTcpWeigherClient;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author JWK
@@ -22,17 +24,41 @@ public class ModbusTestController {
     @Autowired(required = false)
     private ModbusTcpWeigherClient modbusTcpWeigherClient;
 
+    @Autowired
+    private IInvLotLocIdService invLotLocIdService;
+
 
-    @ApiOperation("称重机读")
+    /**
+     * 读
+     *
+     * @param offset 0 光电1号 ｜ 1 光电2号 ｜ 2 光电3号 ｜ 3 光电4号
+     * @return
+     * @throws Exception
+     */
+    @ApiOperation("读光电，称重数据，0 光电1号|1 光电2号|2 光电3号|3 光电4号")
     @RequestMapping(value = "/read", method = RequestMethod.POST)
     @ResponseBody
-    public AjaxResult read(Integer slaveId, Integer offset) throws Exception {
+    public AjaxResult read(Integer offset) throws Exception {
         if (modbusTcpWeigherClient == null) {
             return AjaxResult.error("称重机关闭！");
         }
-        Number number = modbusTcpWeigherClient.read(slaveId,offset);
+        Number number = modbusTcpWeigherClient.read(offset);
         int i = number.intValue();
         return AjaxResult.success("拿到数据：" + i);
     }
 
+    /**
+     * 复称回调
+     *
+     * @param
+     * @return
+     * @throws Exception
+     */
+    @ApiOperation("复称回调")
+    @RequestMapping(value = "/compoundCallback", method = RequestMethod.POST)
+    @ResponseBody
+    public AjaxResult compoundCallback(String taskNo, int weight) throws Exception {
+        return invLotLocIdService.insertWeighingData(taskNo, weight);
+    }
+
 }

warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/service/StatusUpdateService.java

@@ -26,7 +26,7 @@ public interface StatusUpdateService {
     void confirmAnalysis(String taskNo, Integer aciIndex, String type, Integer carNo);
 
     /**
-     * 取卸货确认分析
+     * 确认分析
      *
      * @param taskNo
      * @param aciIndex
@@ -37,6 +37,18 @@ public interface StatusUpdateService {
     void confirmAnalysis(String taskNo, Integer aciIndex, Integer carNo
             , String updateLocation, String updateValue);
 
+    /**
+     * 取卸货确认分析
+     *
+     * @param taskNo
+     * @param aciIndex
+     * @param carNo
+     * @param updateLocation
+     * @param updateValue
+     */
+    void confirmAnalysisWeighing(String taskNo, Integer aciIndex, Integer carNo
+            , String updateLocation, String updateValue);
+
 
     /**
      * 回告ts门已经打开

warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/service/impl/SocketBufferServiceImpl.java

@@ -267,7 +267,7 @@ public class SocketBufferServiceImpl implements SocketBufferService {
                     AmsTask task123 = amsTaskService.selectAmsTaskByModel(index123);
                     if (task123 != null) {
                         executorService.execute(() -> {
-                            statusUpdateService.confirmAnalysis(task123.getTaskNo(), index123, icarNo
+                            statusUpdateService.confirmAnalysisWeighing(task123.getTaskNo(), index123, icarNo
                                     , "0A", "0001");
                         });
                     }

warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/service/impl/StatusUpdateServiceImpl.java

@@ -7,10 +7,12 @@ import com.ruoyi.ams.agv.ndc.service.IAmsTaskService;
 import com.ruoyi.ams.agv.ndc.service.StatusUpdateService;
 import com.ruoyi.ams.business.BusinessServiceImpl;
 import com.ruoyi.ams.business.IBusinessService;
+import com.ruoyi.ams.inv.service.IInvLotLocIdService;
 import com.ruoyi.ams.task.service.IWcsTaskService;
 import com.ruoyi.base.constant.Constant;
 import com.ruoyi.common.utils.uuid.SnowflakeIdWorker;
 import com.ruoyi.hard.modbus.tcp.AutoDoorClient;
+import com.ruoyi.hard.modbus.tcp.ModbusTcpWeigherClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -28,7 +30,9 @@ public class StatusUpdateServiceImpl implements StatusUpdateService {
     @Autowired
     private IBusinessService businessService;
     @Autowired
-    private AutoDoorClient autoDoorClient;
+    private ModbusTcpWeigherClient modbusTcpWeigherClient;
+    @Autowired
+    private IInvLotLocIdService invLotLocIdService;
 
     public enum AGV_ACTION {
         /***
@@ -174,6 +178,43 @@ public class StatusUpdateServiceImpl implements StatusUpdateService {
         }
     }
 
+    @Override
+    public synchronized void confirmAnalysisWeighing(String taskNo, Integer aciIndex, Integer carNo
+            , String updateLocation, String updateValue) {
+        AmsTask amsTask = new AmsTask();
+        amsTask.setTaskNo(taskNo);
+        amsTask = amsTaskService.selectAmsTaskByModel(amsTask);
+        if (amsTask != null) {
+            AmsTask addTaskForm = new AmsTask();
+            addTaskForm.setTaskNo(System.currentTimeMillis() + "");
+            addTaskForm.setBusinessType(Constant.TASK_BUSINESS_TYPE.TASK_m.getValue());
+            addTaskForm.setExt1(amsTask.getAciIndex().toString());
+            addTaskForm.setStFrom(998);
+            addTaskForm.setStTo(999);
+            addTaskForm.setPriority(1);
+            addTaskForm.setRemark(taskNo);
+            addTaskForm.setExt2(updateLocation);
+            addTaskForm.setExt3(updateValue);
+            //如果ams_task已经有此任务的待接收m消息，则不生成新的m消息
+            AmsTask amsTaskQuery = new AmsTask();
+            amsTaskQuery.setAciAccept(0);
+            amsTaskQuery.setIsDelete(0);
+            amsTaskQuery.setRemark(taskNo);
+            amsTaskQuery.setBusinessType(Constant.TASK_BUSINESS_TYPE.TASK_m.getValue());
+            amsTaskQuery.setExt2(addTaskForm.getExt2());
+            amsTaskQuery.setExt2(addTaskForm.getExt3());
+            List<AmsTask> undoneList = amsTaskService.selectAmsTaskList(amsTaskQuery);
+            if (undoneList.size() > 0) {
+                return;
+            }
+            // 拿到称重数据
+            int weight = modbusTcpWeigherClient.readWeighing();
+            // 插入复称数据
+            invLotLocIdService.insertWeighingData(taskNo, weight);
+            amsTaskService.insertAmsTask(addTaskForm);
+        }
+    }
+
     @Override
     public void feedbackTS(Integer doorNo) {
         AmsTask addTaskForm = new AmsTask();

warewms-ams/src/main/java/com/ruoyi/ams/inv/service/IInvLotLocIdService.java

@@ -289,4 +289,13 @@ public interface IInvLotLocIdService {
      * @return true 代表质检没有问题，可以出库
      */
     boolean verifyInventoryCanOutbound(String locationId);
+
+    /**
+     * 插入复称数据
+     *
+     * @param taskNo
+     * @param weight
+     * @return
+     */
+    AjaxResult insertWeighingData(String taskNo,int weight);
 }

warewms-ams/src/main/java/com/ruoyi/ams/inv/service/impl/InvLotLocIdServiceImpl.java

@@ -16,6 +16,8 @@ import com.ruoyi.ams.inv.mapper.InvLotAttMapper;
 import com.ruoyi.ams.inv.mapper.InvLotLocIdMapper;
 import com.ruoyi.ams.inv.service.IInvLotLocIdService;
 import com.ruoyi.ams.task.domain.WcsTask;
+import com.ruoyi.ams.weighData.domain.WeighData;
+import com.ruoyi.ams.weighData.service.IWeighDataService;
 import com.ruoyi.base.constant.Constant;
 import com.ruoyi.base.domain.BaseLocationInfo;
 import com.ruoyi.base.service.IBaseLocationInfoService;
@@ -62,6 +64,8 @@ public class InvLotLocIdServiceImpl implements IInvLotLocIdService {
     private IBusinessService iBusinessService;
     @Autowired
     private RedisCache redisCache;
+    @Autowired
+    private IWeighDataService iWeighDataService;
 
     /**
      * 查询库位库存信息
@@ -690,4 +694,24 @@ public class InvLotLocIdServiceImpl implements IInvLotLocIdService {
         List<InvLotLocIdLotattVO> lotattVOList = selectInvLocIdLotattList(invLocIdSearchFrom);
         return lotattVOList.stream().allMatch(v -> !v.getLotatt05().equals("DJ"));
     }
+
+    @Override
+    public AjaxResult insertWeighingData(String taskNo, int weight) {
+        InvLotLocId invLotLocId = new InvLotLocId();
+        invLotLocId.setTraceid(taskNo);
+        List<InvLotLocId> invLotLocIdList = invLotLocIdService.selectInvLotLocIdList(invLotLocId);
+        if (invLotLocIdList.size() == 0) {
+            return AjaxResult.error("库存不存在！" + taskNo);
+        }
+        InvLotLocId lotLocId = invLotLocIdList.get(0);
+        InvLotAtt invLotAtt = new InvLotAtt();
+        invLotAtt.setLotnum(lotLocId.getLotnum());
+        invLotAtt.setLotatt14(weight + "");
+        invLotAttMapper.updateInvLotAtt(invLotAtt);
+        // 插入复称表
+        WeighData weighData = new WeighData();
+        weighData.setLotnum(invLotAtt.getLotnum());
+        iWeighDataService.insertWeighData(weighData);
+        return AjaxResult.success();
+    }
 }

warewms-hard/src/main/java/com/ruoyi/hard/modbus/tcp/ModbusTcpWeigherClient.java

@@ -30,24 +30,21 @@ public class ModbusTcpWeigherClient {
     /**
      * 读称重机和光电信号
      *
-     * @param slaveId
      * @param offset
      * @return
      */
-    public Number read(int slaveId, int offset) {
+    public Number read(int offset) {
         ModbusMasterUtil modbusMasterUtil = modbusTcpMasterTemplateFirst.getModbusMasterUtil();
-        return modbusMasterUtil.readHoldingRegister(slaveId,offset, DATA_TYPE_WRAPPER.TWO_BYTE_INT_UNSIGNED);
+        return modbusMasterUtil.readHoldingRegister(1, offset, DATA_TYPE_WRAPPER.TWO_BYTE_INT_UNSIGNED);
     }
 
 
     /**
      * 读光电1信号
      *
-     * @param slaveId
-     * @param offset
      * @return
      */
-    public boolean readPhotoelectricity01(int slaveId, int offset) {
+    public boolean readPhotoelectricity01() {
         ModbusMasterUtil modbusMasterUtil = modbusTcpMasterTemplateFirst.getModbusMasterUtil();
         Number number = modbusMasterUtil.readHoldingRegister(1, 0, DATA_TYPE_WRAPPER.TWO_BYTE_INT_UNSIGNED);
         int i = number.intValue();
@@ -55,13 +52,11 @@ public class ModbusTcpWeigherClient {
     }
 
     /**
-     *读光电2信号
+     * 读光电2信号
      *
-     * @param slaveId
-     * @param offset
      * @return
      */
-    public boolean readPhotoelectricity02(int slaveId, int offset) {
+    public boolean readPhotoelectricity02() {
         ModbusMasterUtil modbusMasterUtil = modbusTcpMasterTemplateFirst.getModbusMasterUtil();
         Number number = modbusMasterUtil.readHoldingRegister(1, 1, DATA_TYPE_WRAPPER.TWO_BYTE_INT_UNSIGNED);
         int i = number.intValue();
@@ -85,11 +80,9 @@ public class ModbusTcpWeigherClient {
     /**
      * 读称重机上货物重量
      *
-     * @param slaveId
-     * @param offset
      * @return
      */
-    public int readCharge(int slaveId, int offset) {
+    public int readWeighing() {
         ModbusMasterUtil modbusMasterUtil = modbusTcpMasterTemplateFirst.getModbusMasterUtil();
         return modbusMasterUtil.readHoldingRegister(1, 3, DATA_TYPE_WRAPPER.TWO_BYTE_INT_UNSIGNED).intValue();
     }