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

1

Browse Source
This commit is contained in:
张江玮
2022-08-31 17:08:24 +08:00
parent c5a4ca275c e8128dc341
commit a2e96583c3
4 changed files with 50 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java
View File

@@ -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,37 @@ public class StructFindUtil {
public static JSONObject getEmptyVehicleOutStruct(JSONObject jsonObject) {
String area_type = jsonObject.getString("area_type");
String vehicle_type = jsonObject.getString("vehicle_type");
<<<<<<< HEAD
String point_code = jsonObject.getString("point_code");
//如果是堆叠位5 需要更新 设备状态
if(StrUtil.equals(point_code,"KGTDDW05")){
JSONArray pointarr = WQL.getWO("ACSTOMES_001").addParam("area_type", AreaEnum.KGTDDQ.getCode()).addParam("flag", "2").process().getResultJSONArray(0);
PointUpdateUtil.updatePoint(pointarr);
}
=======
String point_code = jsonObject.getString("point_code");
>>>>>>> e8128dc341c4130669bc99381c16f30bb0e5ddef
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);
JSONObject result = new JSONObject();
//如果是堆叠位5 需要更新 设备状态
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);
}
return result;
}

22
wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql
View File

@@ -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

19
wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/callMaterial/service/impl/CallMaterialServiceImpl.java
View File

@@ -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));
}

3
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java
View File

@@ -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("创建方式不能为空！");
}