From 09e7f564794b1547ac82f900b0aacf0633437945 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Thu, 10 Nov 2022 14:32:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/basedata/master/wql/mdpb.xls | Bin 160256 -> 162816 bytes .../mes/service/impl/MesToLmsServiceImpl.java | 2 +- .../wms/ext/sap/rest/LmsToSapController.java | 4 +- .../nl/wms/pda/mps/rest/OutController.java | 14 +++++ .../wms/pda/mps/rest/ShippingController.java | 14 +++++ .../nl/wms/pda/mps/service/OutService.java | 14 +++++ .../wms/pda/mps/service/ShippingService.java | 14 +++++ .../pda/mps/service/impl/OutServiceImpl.java | 36 +++++++++++ .../mps/service/impl/ShippingServiceImpl.java | 57 ++++++++++++++++++ .../java/org/nl/wms/pda/mps/wql/PDA_02.wql | 52 +++++++++++++++- 10 files changed, 203 insertions(+), 4 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls index 3890dc31360dfd0ac3befaf2ede9649f277f9731..9746eb4ecd3804cdf6c03c31d711b366f1672b11 100644 GIT binary patch delta 12038 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 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java index 4e5940fe3..1714fda99 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java @@ -531,7 +531,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { } else { - //生成一个成品出库任务 + //生成一个改切出库任务 //查询该箱子所在仓位 String package_box_sn = plan_jo.getString("package_box_sn"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/LmsToSapController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/LmsToSapController.java index 50479a795..d94b1149b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/LmsToSapController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/LmsToSapController.java @@ -30,8 +30,8 @@ public class LmsToSapController { } @PostMapping("/returnMoveDtl") - @Log("LMS创建移库单") - @ApiOperation("LMS创建移库单") + @Log("LMS移库接口回传") + @ApiOperation("LMS移库接口回传") public ResponseEntity returnMoveDtl(@RequestBody JSONObject jo) { return new ResponseEntity<>(LmsToSapService.returnMoveDtl(jo), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/OutController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/OutController.java index ebeb26e92..e81b9e10f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/OutController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/OutController.java @@ -37,4 +37,18 @@ public class OutController { public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(outService.confirm(whereJson), HttpStatus.OK); } + + @PostMapping("/conveyPointQuery") + @Log("缓存点位查询") + @ApiOperation("缓存点位查询") + public ResponseEntity conveyPointQuery(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(outService.conveyPointQuery(whereJson), HttpStatus.OK); + } + + @PostMapping("/conveyConfirm") + @Log("出站配送") + @ApiOperation("出站配送") + public ResponseEntity conveyConfirm(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(outService.conveyConfirm(whereJson), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/ShippingController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/ShippingController.java index dd6f3d037..f06e434a1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/ShippingController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/ShippingController.java @@ -44,4 +44,18 @@ public class ShippingController { public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(shippingService.confirm(whereJson), HttpStatus.OK); } + + @PostMapping("/returnVehicle") + @Log("载具送回") + @ApiOperation("载具送回") + public ResponseEntity returnVehicle(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(shippingService.returnVehicle(whereJson), HttpStatus.OK); + } + + @PostMapping("/check") + @Log("配送校验") + @ApiOperation("配送校验") + public ResponseEntity check(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(shippingService.check(whereJson), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/OutService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/OutService.java index e00fe01a6..9b397ce5f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/OutService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/OutService.java @@ -19,4 +19,18 @@ public interface OutService { */ JSONObject confirm(JSONObject whereJson); + /** + * 缓存点位查询 + * @param whereJson / + * @return JSONObject + */ + JSONObject conveyPointQuery(JSONObject whereJson); + + /** + * 出站配送 + * @param whereJson / + * @return JSONObject + */ + JSONObject conveyConfirm(JSONObject whereJson); + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/ShippingService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/ShippingService.java index 75c19045e..bd91fbadf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/ShippingService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/ShippingService.java @@ -26,4 +26,18 @@ public interface ShippingService { */ JSONObject confirm(JSONObject whereJson); + /** + * 载具送回 + * @param whereJson / + * @return JSONObject + */ + JSONObject returnVehicle(JSONObject whereJson); + + /** + * 配送校验 + * @param whereJson / + * @return JSONObject + */ + JSONObject check(JSONObject whereJson); + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java index 433ca8e2b..9311e94f0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java @@ -12,6 +12,7 @@ import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.pda.mps.service.OutService; import org.nl.wms.pda.mps.service.ShippingService; +import org.nl.wms.sch.tasks.CutConveyorTask; import org.nl.wms.sch.tasks.CutTrussTask; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -157,5 +158,40 @@ public class OutServiceImpl implements OutService { return result; } + @Override + public JSONObject conveyPointQuery(JSONObject whereJson) { + String product_area = whereJson.getString("product_area"); + HashMap map = new HashMap<>(); + map.put("flag","10"); + if (StrUtil.isNotEmpty(product_area)){ + map.put("product_area",product_area); + } + JSONArray deliver_rows = WQL.getWO("PDA_02").addParam("product_area",product_area).addParam("flag","").process().getResultJSONArray(0); + JSONObject jo = new JSONObject(); + jo.put("data",deliver_rows); + jo.put("message","查询成功!"); + return jo; + } + + @Override + public JSONObject conveyConfirm(JSONObject whereJson) { + String point_code = whereJson.getString("point_code"); + if (StrUtil.isEmpty(point_code)){ + throw new BadRequestException("起点不能为空！"); + } + + //如果查询到给ACS下发一个输送线任务 + JSONObject form = new JSONObject(); + form.put("point_code1",point_code); + form.put("point_code2","SS01"); + form.put("task_type","010401"); + CutConveyorTask cutConveyorTask = new CutConveyorTask(); + cutConveyorTask.createTask(form); + + JSONObject jo = new JSONObject(); + jo.put("message","查询成功!"); + return jo; + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java index 94f19eb26..136dd936d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java @@ -72,6 +72,10 @@ public class ShippingServiceImpl implements ShippingService { @Override public JSONObject confirm(JSONObject whereJson) { JSONArray rows = whereJson.getJSONArray("cut_rows"); + String vehicle_code = whereJson.getString("vehicle_code"); + if (StrUtil.isEmpty(vehicle_code)){ + throw new BadRequestException("载具号不能为空！"); + } if (rows.size()>2){ throw new BadRequestException("最多选择两个子卷进行操作！"); @@ -126,6 +130,16 @@ public class ShippingServiceImpl implements ShippingService { map.put("qzzno", qzzno); } JSONObject plan_jo = WQL.getWO("PDA_02").addParamMap(map).process().uniqueResult(0); + + JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("ext_code = '"+resource_name+"'").uniqueResult(0); + String product_area = cut_jo.getString("product_area"); + String point_location = cut_jo.getString("point_location"); + + JSONObject vehicle_area = WQLObject.getWQLObject("md_pb_vehiclearea").query("product_area = '"+product_area+"' AND point_location = '"+point_location+"' AND vehicle_code = '"+vehicle_code+"'").uniqueResult(0); + + if (ObjectUtil.isEmpty(vehicle_area)){ + throw new BadRequestException("该气涨轴无法放在该载具上！"); + } //查询离该分切计划包含机台最近的一个空点位 JSONObject empty_point = WQL.getWO("PDA_02") .addParam("sql_str", " ORDER BY abs("+plan_jo.getString("sort_seq")+"-sort_seq),point_code") @@ -158,5 +172,48 @@ public class ShippingServiceImpl implements ShippingService { return jo; } + @Override + public JSONObject returnVehicle(JSONObject whereJson) { + String point_code = whereJson.getString("point_code"); + if (StrUtil.isEmpty(point_code)){ + throw new BadRequestException("起点不能为空！"); + } + + //根据起点判断区域查询对应的输送线空点位 + JSONObject point_jo = WQL.getWO("PDA_02").addParam("flag","4").addParam("product_area","A").process().uniqueResult(0); + //下发输送线任务 + JSONObject form = new JSONObject(); + form.put("point_code1",point_code); + form.put("point_code2",point_jo.getString("point_code")); + form.put("task_type","010402"); + form.put("vehicle_code",""); + cutConveyorTask.createTask(form); + JSONObject jo = new JSONObject(); + jo.put("message","操作成功！"); + return jo; + } + + @Override + public JSONObject check(JSONObject whereJson) { + String qzzno = whereJson.getString("qzzno"); + String vehicle_code = whereJson.getString("vehicle_code"); + + JSONObject plan = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("qzz_no = '"+qzzno+"'").uniqueResult(0); + String resource_name = plan.getString("resource_name"); + JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("ext_code = '"+resource_name+"'").uniqueResult(0); + String product_area = cut_jo.getString("product_area"); + String point_location = cut_jo.getString("point_location"); + + JSONObject vehicle_area = WQLObject.getWQLObject("md_pb_vehiclearea").query("product_area = '"+product_area+"' AND point_location = '"+point_location+"' AND vehicle_code = '"+vehicle_code+"'").uniqueResult(0); + + if (ObjectUtil.isEmpty(vehicle_area)){ + throw new BadRequestException("该气涨轴无法放在该载具上！"); + } + + JSONObject jo = new JSONObject(); + jo.put("message","校验无误，可以进行配送！"); + return jo; + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql index cb8b961eb..07c882f69 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql @@ -143,10 +143,20 @@ st_ivt_deliverypointivt ivt WHERE point_status = '01' + AND NOT EXISTS ( + SELECT + * + FROM + sch_base_task + WHERE + ( point_code1 = ivt.point_code OR point_code2 = ivt.point_code ) + AND task_status < '07' + AND is_delete = '0' + ) OPTION 输入.product_area <> "" ivt.product_area = 输入.product_area ENDOPTION - OPTION 输入.product_area <> "" + OPTION 输入.point_location <> "" ivt.point_location = 输入.point_location ENDOPTION 输入.sql_str @@ -261,3 +271,43 @@ ENDQUERY ENDIF + IF 输入.flag = "9" + QUERY + SELECT + up_point_code AS VALUE, + CONCAT( point_code, '上轴位' ) AS text + FROM + st_ivt_cutpointivt cut + WHERE + cut.point_code = 输入.device_code + UNION + + SELECT + down_point_code AS VALUE, + CONCAT( point_code, '下轴位' ) AS text + FROM + st_ivt_cutpointivt cut + WHERE + cut.point_code = 输入.device_code + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "10" + QUERY + SELECT + * + FROM + st_ivt_deliverypointivt del + WHERE + 1=1 + OPTINON 输入.product_area <> " + del.product_area = 输入.product_area + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF + + + +