From afaac0aafea6ac852663df4be1531ba91804e863 Mon Sep 17 00:00:00 2001
From: 18188916393 <2562295436@qq.com>
Date: Wed, 31 Aug 2022 16:55:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=8B=E6=8C=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/CallMaterialServiceImpl.java | 19 ++++++-------------
.../wms/sch/manage/buss/CallMaterialTask.java | 3 ---
2 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/callMaterial/service/impl/CallMaterialServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/callMaterial/service/impl/CallMaterialServiceImpl.java
index 4cb364c..069621f 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/callMaterial/service/impl/CallMaterialServiceImpl.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/callMaterial/service/impl/CallMaterialServiceImpl.java
@@ -53,6 +53,7 @@ public class CallMaterialServiceImpl implements CallMaterialService {
public Map<String, Object> bussConfirm(@RequestBody Map<String, String> param) {
String is_full = param.get("is_full");
String next_point_code = param.get("point_code");
+ String material_id = param.get("material_id");
if (StrUtil.isEmpty(is_full)) {
throw new PdaRequestException("是否满拖不能为空！");
}
@@ -65,13 +66,7 @@ public class CallMaterialServiceImpl implements CallMaterialService {
String point_type = pointObj.getString("point_type");
//如果是压机上料位置则走转储的流程
if (StrUtil.equals(point_type, "05")) {
- //查询当前压机对应的排产单的物料信息是
- JSONObject TaskObj = WQLObject.getWQLObject("PDM_MG_produceTask").query("device_id='" + pointObj.getString("device_id") + "' and producetask_status in ('02','03','04') and is_delete='0'").uniqueResult(0);
- if (ObjectUtil.isEmpty(TaskObj)) {
- throw new BadRequestException("未找到该点位设备的工单信息！");
- }
- String material_id = TaskObj.getString("material_id");
- String startArea_type = AreaEnum.KLHJ.getCode();
+ String startArea_type = AreaEnum.KLHJ.getCode();
JSONObject param1 = new JSONObject();
param1.put("material_id", material_id);
param1.put("area_type", startArea_type);
@@ -133,12 +128,10 @@ public class CallMaterialServiceImpl implements CallMaterialService {
jsonObject.put("next_point_code", next_point_code);
jsonObject.put("create_mode", "03");
//批次 物料，客户要从排产单里面去取
- jsonObject.put("pcsn", "pcsn");
- JSONObject produceInfoByCode = this.getProduceInfoByCode(next_point_code);
- jsonObject.put("material_id", produceInfoByCode.getString("material_id"));
- jsonObject.put("cust_id", produceInfoByCode.getString("cust_id"));
- jsonObject.put("stewing_time", produceInfoByCode.getString("stewing_time"));
- jsonObject.put("producetask_id", produceInfoByCode.getString("producetask_id"));
+ // jsonObject.put("pcsn", "pcsn");
+ //JSONObject produceInfoByCode = this.getProduceInfoByCode(next_point_code);
+ jsonObject.put("material_id", material_id);
+ //jsonObject.put("producetask_id", produceInfoByCode.getString("producetask_id"));
jsonObject.put("is_full", is_full);
callMaterialTask.createTask((JSONObject) JSON.toJSON(jsonObject));
}
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java
index 52a3589..b655488 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java
@@ -179,9 +179,6 @@ public class CallMaterialTask extends AbstractAcsTask {
if (StrUtil.isEmpty(material_id)) {
throw new BadRequestException("物料标识不能为空！");
}
- if (StrUtil.isEmpty(cust_id)) {
- throw new BadRequestException("客户不能为空！");
- }
if (StrUtil.isEmpty(create_mode)) {
throw new BadRequestException("创建方式不能为空！");
}
From e8128dc341c4130669bc99381c16f30bb0e5ddef Mon Sep 17 00:00:00 2001
From: 18188916393 <2562295436@qq.com>
Date: Wed, 31 Aug 2022 17:03:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=91=BC=E5=8F=AB=E7=A9=BA=E6=89=98?=
=?UTF-8?q?=E7=9B=98=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../org/nl/wms/common/StructFindUtil.java | 30 ++++++++++++-------
.../org/nl/wms/common/wql/QSTRUCT_RULE.wql | 22 +++++++++++++-
2 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java
index b6d1270..0854dbd 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java
@@ -69,7 +69,7 @@ public class StructFindUtil {
if (StrUtil.isEmpty(vehicle_code)) {
throw new BadRequestException("托盘不能为空！");
}
- if (StrUtil.equals(point_code,"KGTPDDW05")){
+ if (StrUtil.equals(point_code, "KGTPDDW05")) {
JSONArray pointarr = WQL.getWO("ACSTOMES_001").addParam("area_type", AreaEnum.KGTDDQ).addParam("flag", "2").process().getResultJSONArray(0);
PointUpdateUtil.updatePoint(pointarr);
}
@@ -93,20 +93,28 @@ public class StructFindUtil {
public static JSONObject getEmptyVehicleOutStruct(JSONObject jsonObject) {
String area_type = jsonObject.getString("area_type");
String vehicle_type = jsonObject.getString("vehicle_type");
- String point_code = jsonObject.getString("point_code");
+ String point_code = jsonObject.getString("point_code");
+ if (StrUtil.isEmpty(area_type)) {
+ throw new BadRequestException("区域不能为空！");
+ }
+ JSONObject result = new JSONObject();
//如果是堆叠位5 需要更新 设备状态
- if(StrUtil.equals(point_code,"KGTPDDW05")){
+ if (StrUtil.equals(point_code, "KGTPDDW05")) {
JSONArray pointarr = WQL.getWO("ACSTOMES_001").addParam("area_type", AreaEnum.KGTDDQ).addParam("flag", "2").process().getResultJSONArray(0);
PointUpdateUtil.updatePoint(pointarr);
+ result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "6")
+ .addParam("area_type", area_type)
+ .addParam("vehicle_type", vehicle_type)
+ .addParam("point_code", point_code)
+ .process().uniqueResult(0);
+ } else {
+ result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "5")
+ .addParam("area_type", area_type)
+ .addParam("vehicle_type", vehicle_type)
+ .addParam("point_code", point_code)
+ .process().uniqueResult(0);
}
- if (StrUtil.isEmpty(area_type)) {
- throw new BadRequestException("区域不能为空！");
- }
- JSONObject result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "5")
- .addParam("area_type", area_type)
- .addParam("vehicle_type", vehicle_type)
- .addParam("point_code", point_code)
- .process().uniqueResult(0);
+
return result;
}
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql
index 58a4b00..a8ef5dc 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql
@@ -196,8 +196,28 @@ IF 输入.flag = "5"
OPTION 输入.point_code <> ""
point.point_code = 输入.point_code
ENDOPTION
+ ENDSELECT
+ ENDQUERY
+ENDIF
-
+IF 输入.flag = "6"
+ QUERY
+ SELECT DISTINCT
+ point.point_id AS struct_id,
+ point.point_code AS struct_code,
+ point.point_name AS struct_name,
+ point.vehicle_code
+ FROM
+ sch_base_point point
+ WHERE
+ point.lock_type = '00'
+ AND point.point_status = '01'
+ OPTION 输入.area_type <> ""
+ point.area_type = 输入.area_type
+ ENDOPTION
+ OPTION 输入.point_code <> ""
+ point.point_code = 输入.point_code
+ ENDOPTION
ENDSELECT
ENDQUERY
ENDIF
\ No newline at end of file