代码更新

wms/hd/nladmin-system/src/main/java/org/nl/ACS接口说明

@@ -1,10 +1,9 @@
-applyTaskManipulatorToWms	机械手申请任务	/api/acsToWms/task/manipulatorApply
+applyTaskManipulatorToWms	压制机械手申请任务	/api/acsToWms/task/manipulatorApply
 queryCribbingInfo	        获取木托盘信息	/api/acsToWms/task/queryCribbingInfo
 getVehicleCode	            获取托盘号	/api/wms/task/getEmptyVehicle_code
 feedbackPointStatusToWms	向WMS反馈点位状态	/api/acsToWms/task
 applyIntoKiln	            申请入窑输送任务	/api/acsToWms/task/group
 applyTaskToWms	            ACS向WMS申请任务	/api/acsToWms/task/apply
-requestSignalInteraction	请求信号交互	/api/Wms_AgvApi/SignalInteraction
 ispackage	                出窑申请去包装	/api/wms/task/ispackage
 getVehicleTokiln	        获取入窑托盘信息	api/
 queryDoorsStatus	        查询自动门状态	/api/acsToWms/queryDoorsStatus

wms/hd/nladmin-system/src/main/java/org/nl/wms/common/SortingUtil.java

@@ -1,5 +1,6 @@
 package org.nl.wms.common;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -22,9 +23,11 @@ public class SortingUtil {
         WQLObject ehicleRelaRecordmst = WQLObject.getWQLObject("st_buss_vehicleRelaRecord");
         //木托盘对应刚托盘记录明细【st_buss_vehicleRelaRecordtl】
         WQLObject ehicleRelaRecordmstdtl = WQLObject.getWQLObject("st_buss_vehicleRelaRecordtl");
+
         //st_buss_vehiclegroup
         WQLObject groupTable = WQLObject.getWQLObject("st_buss_vehiclegroup");
         JSONObject mstObj = ehicleRelaRecordmst.query("vehicle_code='" + vehicle_code + "'").uniqueResult(0);
+
         String record_id = IdUtil.getSnowflake(1, 1).nextIdStr();
 
 
@@ -37,7 +40,7 @@ public class SortingUtil {
 
         JSONArray pointArr = new JSONArray();
         //假如是分拣机械手3，则去查询分拣机械手3下料位置的托盘号码
-        if (StrUtil.equals(device_code, "FJJXSSLW301") || StrUtil.equals("FJJXSSLW302", device_code)) {
+        if (StrUtil.equals(device_code, "FJJXSXLW301") || StrUtil.equals("FJJXSSLW302", device_code)) {
             pointArr = WQL.getWO("WMSTOJN_001").addParam("flag", "4").process().getResultJSONArray(0);
         } else {
             pointArr = WQL.getWO("WMSTOJN_001").addParam("flag", "5").process().getResultJSONArray(0);
@@ -53,13 +56,17 @@ public class SortingUtil {
             if (ObjectUtil.isEmpty(dtljo)) {
                 JSONObject groupObj = groupTable.query("vehicle_code='" + Sl_vehicle_code + "'", "create_time desc").uniqueResult(0);
                 if (ObjectUtil.isEmpty(groupObj)) {
-                    throw new BadRequestException("未找到托盘编号为'" + vehicle_code + "'");
+//                    throw new BadRequestException("未找到托盘编号为'" + vehicle_code + "'");
                 }
+                if (dtljo==null)dtljo=new JSONObject();
+                if (groupObj==null)groupObj=new JSONObject();
+
                 dtljo.put("recordtl_id", IdUtil.getSnowflake(1, 1).nextId());
                 dtljo.put("record_id", record_id);
                 dtljo.put("vehicle_code", Sl_vehicle_code);
                 dtljo.put("producetask_id", groupObj.get("producetask_id"));
                 dtljo.put("material_move_id", groupObj.get("material_move_id"));
+                dtljo.put("create_time", DateUtil.now());
                 mstObj.put("material_id", groupObj.get("material_id"));
                 ehicleRelaRecordmst.update(mstObj);
                 ehicleRelaRecordmstdtl.insert(dtljo);

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

@@ -16,7 +16,7 @@ public interface AcsToWmsService {
 
     Map<String, Object> receiveTaskFromAcs(Map jsonObject);
 
-    Map<String, Object> receiveTaskFromAcsTrancs(Map jsonObject);
+    Map<String, Object> receiveTaskFromAcsTrans(Map jsonObject);
     /**
      * ACS客户端--->WMS服务端
      * ACS机械手给WMS发送任务

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

@@ -74,7 +74,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         boolean tryLock = lock.tryLock(5, TimeUnit.SECONDS);
         try {
             if (tryLock) {
-                return acsToWmsService.receiveTaskFromAcsTrancs(jsonObject);
+                return acsToWmsService.receiveTaskFromAcsTrans(jsonObject);
             }
         } finally {
             if (tryLock) {
@@ -87,7 +87,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
 
     @Override
     @Transactional
-    public Map<String, Object> receiveTaskFromAcsTrancs(Map jsonObject) {
+    public Map<String, Object> receiveTaskFromAcsTrans(Map jsonObject) {
         log.debug("ACS的receiveTaskFromAcs请求参数为:" + jsonObject);
         String device_code = (String) jsonObject.get("device_code");
         String type = (String) jsonObject.get("type");
@@ -462,6 +462,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         jsonObject.put("producetask_id", producetask_id);
         jsonObject.put("material_code", materialObj.getString("material_code"));
         this.receiveTaskFromAcs(jsonObject);
+
+
         JSONObject result = new JSONObject();
         result.put("status", HttpStatus.OK.value());
         result.put("message", "任务状态反馈成功!");

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

@@ -554,8 +554,7 @@ public class WmsToJnServiceImpl implements WmsToJnService {
   public Map<String, Object> feedBackPackage(Map whereJson) {
     try {
       WQLObject wo = WQLObject.getWQLObject("pdm_bi_feedbackrecord");
-      String value =
+      String value = WQLObject.getWQLObject("sys_param")
-          WQLObject.getWQLObject("sys_param")
               .query("code='IS_CONNECT_JN'")
               .uniqueResult(0)
               .getString("value");
@@ -567,8 +566,7 @@ public class WmsToJnServiceImpl implements WmsToJnService {
       if (StrUtil.isEmpty(vehicle_code)) {
 //        throw new BadRequestException("托盘编码不能为空！");
       }
-      JSONObject mstObj =
+      JSONObject mstObj = WQL.getWO("WMSTOJN_001")
-          WQL.getWO("WMSTOJN_001")
               .addParam("flag", "9")
               .addParam("vehicle_code", vehicle_code)
               .process()

wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql

@@ -125,7 +125,7 @@ IF 输入.flag = "5"
       FROM
       	sch_base_point point
       WHERE
-      	point.point_code IN ( 'FJJXSSLW201', 'FJJXSSLW202' )
+      	point.point_code IN ( 'FJJXSSLW101', 'FJJXSSLW102' )
             ENDSELECT
         ENDQUERY
     ENDIF

wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java

@@ -63,11 +63,11 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
             // 解锁仓位，托盘信息，回写到点位上去
             String vehicle_code = jsonTask.getString("vehicle_code");
             // 插入刚托盘木托盘表
-            String point_code = jsonTask.getString("next_point_code");
+            String next_point_code = jsonTask.getString("next_point_code");
-            String area_type = WQLObject.getWQLObject("sch_base_point").query("point_code='" + point_code + "'").uniqueResult(0).getString("area_type");
+            String area_type = WQLObject.getWQLObject("sch_base_point").query("point_code='" + next_point_code + "'").uniqueResult(0).getString("area_type");
             if (StrUtil.equals(area_type, AreaEnum.FJQY.getCode())) {
                 JSONObject jo = new JSONObject();
-                jo.put("device_code", point_code);
+                jo.put("device_code", next_point_code);
                 jo.put("vehicle_code", vehicle_code);
                 SortingUtil.record(jo);
             }