root/yongYuJiaJu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
liyongde
2022-12-24 19:02:32 +08:00
parent 33d6668766
commit f60cbaae6c
4 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java
View File

@@ -21,6 +21,7 @@ import org.nl.wms.sch.service.PointService;
import org.nl.wms.sch.service.dto.PointDto; import org.nl.wms.sch.service.dto.PointDto;
import org.nl.wms.sch.tasks.AcsTaskDto; import org.nl.wms.sch.tasks.AcsTaskDto;
import org.nl.wms.sch.tasks.RegionTypeEnum; import org.nl.wms.sch.tasks.RegionTypeEnum;
import org.nl.wms.sch.tasks.utils.PointUpdateUtil;
import org.nl.wms.util.IdUtil; import org.nl.wms.util.IdUtil;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@@ -108,6 +109,9 @@ public class YqxSendMaterialTask extends AbstractAcsTask {
for (int i = 0; i < taskArry.size(); i++) { for (int i = 0; i < taskArry.size(); i++) {
JSONObject taskObj = taskArry.getJSONObject(i); JSONObject taskObj = taskArry.getJSONObject(i);
String task_id = taskObj.getString("task_id"); String task_id = taskObj.getString("task_id");
// 更新点位
JSONArray jsonArray = WQL.getWO("QSCH_yqxSendMaterial_01").addParam("flag", "2").process().getResultJSONArray(0);
PointUpdateUtil.updatePoint(jsonArray);
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
param.put("flag", "1"); param.put("flag", "1");

12
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_yqxSendMaterial_01.wql
View File

@@ -53,10 +53,22 @@
lock_type = '1' lock_type = '1'
AND is_used = '1' AND is_used = '1'
AND is_delete = '0' AND is_delete = '0'
AND point_status = '1'
and (point_code = 'SSX01A2' or point_code = 'SSX02A1') and (point_code = 'SSX01A2' or point_code = 'SSX02A1')
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
ENDIF ENDIF
IF 输入.flag = "2"
QUERY
SELECT
p.point_code as device_code
FROM
SCH_BASE_Point p
WHERE
region_code = 'SSX01'
ENDSELECT
ENDQUERY
ENDIF

8
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/utils/PointUpdateUtil.java
View File

@@ -29,13 +29,15 @@ public class PointUpdateUtil {
JSONObject pointObj = deviceDatas.getJSONObject(j); JSONObject pointObj = deviceDatas.getJSONObject(j);
String point_code = pointObj.getString("device_code"); String point_code = pointObj.getString("device_code");
JSONObject pointObj2 = pointTable.query("point_code = '" + point_code + "'").uniqueResult(0); JSONObject pointObj2 = pointTable.query("point_code = '" + point_code + "'").uniqueResult(0);
if (point_code.equals(RegionTypeEnum.DPJQB.getCode())) { // 碟盘机 if (pointObj2.getString("region_code").equals(RegionTypeEnum.DPJQB.getCode())) { // 碟盘机
String vehicleNum = pointObj.getString("vehicle_num"); String vehicleNum = pointObj.getString("vehicle_num");
pointObj2.put("vehicle_qty", vehicleNum); pointObj2.put("vehicle_qty", vehicleNum);
pointTable.update(pointObj2); pointTable.update(pointObj2);
} else if (pointObj2.getString("region_code").equals(RegionTypeEnum.SSX.getCode())) {
String move = pointObj.getString("move");
pointObj2.put("point_status", Integer.getInteger(move) + 1);
pointTable.update(pointObj2);
} }
} }
} }
} }

4
lms/nladmin-ui/public/config.js
View File

@@ -1,9 +1,9 @@
window.g = { window.g = {
dev: { dev: {
VUE_APP_BASE_API: 'http://127.0.0.1:8010' VUE_APP_BASE_API: 'http://192.168.4.117:8010'
}, },
prod: { prod: {
VUE_APP_BASE_API: 'http://127.0.0.1:8010' VUE_APP_BASE_API: 'http://192.168.4.117:8010'
} }