From 80da88967326cdda69c7b59199193f57c14aa9f1 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 25 Nov 2022 13:55:04 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/service/impl/MesToLmsServiceImpl.java | 6 ++++++ .../src/main/java/org/nl/wms/pdm/wql/pdm.xls | Bin 248320 -> 249344 bytes .../service/impl/CheckOutBillServiceImpl.java | 10 +++++++-- .../org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql | 19 ++++++++++++++++++ 4 files changed, 33 insertions(+), 2 deletions(-) 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 0581627f1..4db597d1e 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 @@ -695,6 +695,9 @@ public class MesToLmsServiceImpl implements MesToLmsService { String Description = param.getString("Description"); // 来源卷位置 String DateOfFGInbound = param.getString("DateOfFGInbound"); // 来源卷位置 String box_type = param.getString("Attribute1"); // 木箱料号 + String box_length = param.getString("Attribute2"); // 木箱料号 + String box_width = param.getString("Attribute3"); // 木箱料号 + String box_high = param.getString("Attribute4"); // 木箱料号 JSONArray details = param.getJSONArray("details"); @@ -723,6 +726,9 @@ public class MesToLmsServiceImpl implements MesToLmsService { jo.put("package_box_sn", PackageBoxSN); jo.put("sap_pcsn", sap_pcsn); jo.put("box_type", box_type); + jo.put("box_length", box_length); + jo.put("box_width", box_width); + jo.put("box_high", box_high); jo.put("quanlity_in_box", QuanlityInBox); jo.put("box_weight", BoxWeight); jo.put("quality_guaran_period", QualityGuaranPeriod); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index 6f3c831130828f275ede05affc53e20a8ac87e61..3334b86fd79da21a1a73df18a17e66d1467d736d 100644 GIT binary patch delta 13766 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 oneMap = new HashMap<>(); - oneMap.put("vbeln", ""); oneMap.put("consignee", jsonMst.getString("consignee")); oneMap.put("receiver", jsonMst.getString("receiver")); oneMap.put("receiptaddress", jsonMst.getString("receiptaddress")); @@ -2159,7 +2158,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { oneMap.put("carno", jsonMst.getString("carno")); oneMap.put("driverphone", jsonMst.getString("driverphone")); oneMap.put("contractno", jsonMst.getString("contractno")); - oneMap.put("all_box", ""); + // 总箱数 + JSONArray jsonAllBox = WQL.getWO("ST_OUTIVT02").addParam("flag", "4").addParam("iostorinv_id", MapUtil.getStr(whereJson, "iostorinv_id")).process().getResultJSONArray(0); + oneMap.put("all_box", jsonAllBox.size()); oneMap.put("all_qty", ""); oneMap.put("deliveryaddress", jsonMst.getString("deliveryaddress")); oneMap.put("deliveryname", jsonMst.getString("deliveryname")); @@ -2176,6 +2177,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { JSONObject json = dtlArr.getJSONObject(i); HashMap mapFL = new HashMap<>(); + oneMap.put("vbeln", json.getString("vbeln")); // 送货单号 + // 明细 mapFL.put("index", i + 1); mapFL.put("source_bill_code", json.getString("source_bill_code")); mapFL.put("material_name", json.getString("material_name")); @@ -2199,6 +2202,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { } JSONObject json = dtlArr.getJSONObject(i); HashMap mapFL = new HashMap<>(); + + oneMap.put("vbeln", json.getString("vbeln")); // 送货单号 + // 明细 mapFL.put("index", i + 1); mapFL.put("source_bill_code", json.getString("source_bill_code")); mapFL.put("material_name", json.getString("material_name")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql index 61ae56fae..fe82afebc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql @@ -98,6 +98,25 @@ dtl.iostorinv_id = 输入.iostorinv_id ENDOPTION + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "3" + QUERY + SELECT + count(*) AS num + FROM + ST_IVT_IOStorInvDis dis + WHERE + 1 = 1 + + OPTION 输入.iostorinv_id <> "" + dis.iostorinv_id = 输入.iostorinv_id + ENDOPTION + + group by dis.struct_id + ENDSELECT ENDQUERY ENDIF \ No newline at end of file From 78fdfd38e593a258c747a4fd56102194b75b0cb9 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 25 Nov 2022 17:22:52 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../master/service/dto/CustomerbaseDto.java | 5 ++ .../master/wql/QMD_CS_TRANSPORAIONL.wql | 2 +- .../inbill/service/CheckOutBillService.java | 6 ++ .../outbill/rest/CheckOutBillController.java | 7 ++ .../service/impl/CheckOutBillServiceImpl.java | 84 +++++++++++++------ .../org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql | 17 ++-- .../wms/basedata/master/customer/index.vue | 14 ++++ .../src/views/wms/st/outbill/checkoutbill.js | 9 +- .../src/views/wms/st/outbill/index.vue | 22 ++--- 9 files changed, 120 insertions(+), 46 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/CustomerbaseDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/CustomerbaseDto.java index 3c84156fa..e3bf30b64 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/CustomerbaseDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/CustomerbaseDto.java @@ -189,4 +189,9 @@ public class CustomerbaseDto implements Serializable { * 送货单打印模板号 */ private String shd_print_no; + + /** + * 送货单明细数 + */ + private String shd_dtl_num; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_CS_TRANSPORAIONL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_CS_TRANSPORAIONL.wql index 02a888458..f2bb4f63c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_CS_TRANSPORAIONL.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_CS_TRANSPORAIONL.wql @@ -68,7 +68,7 @@ IF 输入.flag = "2" QUERY SELECT - cust_code AS value, + cust_name AS value, cust_name AS label FROM MD_CS_TransportationBase diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java index 8cbd99c80..fb67c7567 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java @@ -176,4 +176,10 @@ public interface CheckOutBillService { * @param whereJson / */ void downloadExcel(HttpServletResponse response, Map whereJson) throws IOException; + + /** + * 获取分配明细条数 + * @param whereJson / + */ + JSONObject getDisNum(Map whereJson); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java index b4dcb58aa..e9b1e432b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java @@ -211,4 +211,11 @@ public class CheckOutBillController { checkOutBillService.downloadExcel(response,whereJson); return new ResponseEntity<>(HttpStatus.OK); } + + @PostMapping("/getDisNum") + @Log("获取分配明细条数") + @ApiOperation("获取分配明细条数") + public ResponseEntity getDisNum(@RequestBody Map whereJson) { + return new ResponseEntity<>(checkOutBillService.getDisNum(whereJson),HttpStatus.OK); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index 118b8bbdc..a53458d4c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -2132,6 +2132,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { WQLObject custTab = WQLObject.getWQLObject("MD_CS_CustomerBase"); // 客户基本信息表 WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_IOStorInv"); // 出入库主表 + WQLObject subTab = WQLObject.getWQLObject("pdm_bi_subpackagerelation"); // 子卷包装关系表 JSONObject jsonMst = mstTab.query("iostorinv_id = '" + MapUtil.getStr(whereJson, "iostorinv_id") + "'").uniqueResult(0); String cust_code = jsonMst.getString("cust_code"); @@ -2149,22 +2150,21 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { // WriteSheet sheet = EasyExcel.writerSheet().build(); // 5.单组填充 HashMap oneMap = new HashMap<>(); - oneMap.put("consignee", jsonMst.getString("consignee")); - oneMap.put("receiver", jsonMst.getString("receiver")); - oneMap.put("receiptaddress", jsonMst.getString("receiptaddress")); - oneMap.put("receiptphone", jsonMst.getString("receiptphone")); - oneMap.put("logisticscompany", jsonMst.getString("logisticscompany")); - oneMap.put("drivername", jsonMst.getString("drivername")); - oneMap.put("carno", jsonMst.getString("carno")); - oneMap.put("driverphone", jsonMst.getString("driverphone")); - oneMap.put("contractno", jsonMst.getString("contractno")); + oneMap.put("bill_code", jsonMst.getString("bill_code")); // 出库单号 + oneMap.put("create_date", DateUtil.today()); // 出库日期 + oneMap.put("consignee", jsonMst.getString("consignee")); // 客户 + oneMap.put("receiptaddress", jsonMst.getString("receiptaddress")); // 客户地址 + oneMap.put("trans_code", jsonMst.getString("trans_code")); // 承运公司 + oneMap.put("receiptaddress2", jsonMst.getString("receiptaddress")); // 收货地址 + oneMap.put("receiptphone", jsonMst.getString("receiver") +"/"+jsonMst.getString("receiptphone")); // 客户电话 + oneMap.put("deliveryphone", jsonMst.getString("deliveryname") +"/"+jsonMst.getString("deliveryphone") ); // 承运人电话 // 总箱数 - JSONArray jsonAllBox = WQL.getWO("ST_OUTIVT02").addParam("flag", "4").addParam("iostorinv_id", MapUtil.getStr(whereJson, "iostorinv_id")).process().getResultJSONArray(0); + /* JSONArray jsonAllBox = WQL.getWO("ST_OUTIVT02").addParam("flag", "4").addParam("iostorinv_id", MapUtil.getStr(whereJson, "iostorinv_id")).process().getResultJSONArray(0); oneMap.put("all_box", jsonAllBox.size()); oneMap.put("all_qty", ""); oneMap.put("deliveryaddress", jsonMst.getString("deliveryaddress")); oneMap.put("deliveryname", jsonMst.getString("deliveryname")); - oneMap.put("deliveryphone", jsonMst.getString("deliveryphone")); + oneMap.put("deliveryphone", jsonMst.getString("deliveryphone"));*/ // 6.多组填充 JSONArray dtlArr = WQL.getWO("ST_OUTIVT02").addParam("flag", "3").addParam("iostorinv_id", MapUtil.getStr(whereJson, "iostorinv_id")).process().getResultJSONArray(0); @@ -2175,16 +2175,27 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { WriteSheet sheet = EasyExcel.writerSheet().build(); for (int i = 0; i < dtlArr.size(); i++) { JSONObject json = dtlArr.getJSONObject(i); - HashMap mapFL = new HashMap<>(); + JSONObject jsonSub = subTab.query("package_box_sn = '" + json.getString("box_no") + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jsonSub)) throw new BadRequestException("没有查询到子卷包装"); - oneMap.put("vbeln", json.getString("vbeln")); // 送货单号 + // 规格： 厚度*幅宽 + String material_spec = jsonSub.getString("thickness") + "*" + jsonSub.getString("width"); + // 箱号 + String box_no = json.getString("box_no"); + String sub_box_no = ""; + if (ObjectUtil.isNotEmpty(box_no)) { + sub_box_no = box_no.substring(box_no.lastIndexOf("@")+1, box_no.length()); + } + + HashMap mapFL = new HashMap<>(); // 明细 - mapFL.put("index", i + 1); - mapFL.put("source_bill_code", json.getString("source_bill_code")); + String date_of_production = jsonSub.getString("date_of_production").replaceAll("[[\\s-:punct:]]", ""); + mapFL.put("date_of_production", date_of_production); // 批号 : 子卷包装生产日期 mapFL.put("material_name", json.getString("material_name")); - mapFL.put("material_spec", json.getString("material_spec")); - mapFL.put("qty", json.getString("real_qty")); - mapFL.put("remark", json.getString("remark")); + mapFL.put("material_spec", material_spec); + mapFL.put("qty_unit_name", "KG"); + mapFL.put("box_no", sub_box_no); + mapFL.put("qty", NumberUtil.round(json.getString("qty"), 2).toString()); flData.add(mapFL); } workBook.fill(oneMap, sheet); @@ -2200,17 +2211,29 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { if (i == dtlArr.size()) { break; } - JSONObject json = dtlArr.getJSONObject(i); - HashMap mapFL = new HashMap<>(); - oneMap.put("vbeln", json.getString("vbeln")); // 送货单号 + JSONObject json = dtlArr.getJSONObject(i); + JSONObject jsonSub = subTab.query("package_box_sn = '" + json.getString("box_no") + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jsonSub)) throw new BadRequestException("没有查询到子卷包装"); + + // 规格： 厚度*幅宽 + String material_spec = jsonSub.getString("thickness") + "*" + jsonSub.getString("width"); + // 箱号 + String box_no = json.getString("box_no"); + String sub_box_no = ""; + if (ObjectUtil.isNotEmpty(box_no)) { + sub_box_no = box_no.substring(box_no.lastIndexOf("@")+1, box_no.length()); + } + + HashMap mapFL = new HashMap<>(); // 明细 - mapFL.put("index", i + 1); - mapFL.put("source_bill_code", json.getString("source_bill_code")); + String date_of_production = jsonSub.getString("date_of_production").replaceAll("[[\\s-:punct:]]", ""); + mapFL.put("date_of_production", date_of_production); // 批号 : 子卷包装生产日期 mapFL.put("material_name", json.getString("material_name")); - mapFL.put("material_spec", json.getString("material_spec")); - mapFL.put("qty", json.getString("real_qty")); - mapFL.put("remark", json.getString("remark")); + mapFL.put("material_spec", material_spec); + mapFL.put("qty_unit_name", "KG"); + mapFL.put("box_no", sub_box_no); + mapFL.put("qty", NumberUtil.round(json.getString("qty"), 2).toString()); flData.add(mapFL); } @@ -2221,6 +2244,15 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { } } + @Override + public JSONObject getDisNum(Map whereJson) { + JSONArray dtlArr = WQL.getWO("ST_OUTIVT02").addParam("flag", "3").addParam("iostorinv_id", MapUtil.getStr(whereJson, "iostorinv_id")).process().getResultJSONArray(0); + + JSONObject json = new JSONObject(); + json.put("num", dtlArr.size()); + return json; + } + /** * 更新主表状态 * diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql index fe82afebc..18e4eeb52 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql @@ -84,25 +84,26 @@ IF 输入.flag = "3" QUERY SELECT - dtl.*, - mater.material_code, - mater.material_name, - mater.material_spec + SUM(dis.real_qty) AS qty, + dis.box_no, + MAX(mater.material_name) AS material_name FROM - ST_IVT_IOStorInvDtl dtl - LEFT JOIN md_me_materialbase mater ON mater.material_id = dtl.material_id + ST_IVT_IOStorInvDis dis + LEFT JOIN md_me_materialbase mater ON mater.material_id = dis.material_id WHERE 1 = 1 OPTION 输入.iostorinv_id <> "" - dtl.iostorinv_id = 输入.iostorinv_id + dis.iostorinv_id = 输入.iostorinv_id ENDOPTION + group by dis.box_no + ENDSELECT ENDQUERY ENDIF - IF 输入.flag = "3" + IF 输入.flag = "4" QUERY SELECT count(*) AS num diff --git a/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue b/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue index 3b0791e97..a591f328c 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue @@ -92,6 +92,18 @@ + + + + + + + + + + + + @@ -115,6 +127,8 @@ + + diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js b/lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js index 033ab90be..fae986b89 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js +++ b/lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js @@ -169,4 +169,11 @@ export function moneySubmit(data) { data }) } -export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit } +export function getDisNum(data) { + return request({ + url: '/api/checkoutbill/getDisNum', + method: 'post', + data + }) +} +export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum } diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue index ac4d72c23..ea426d10d 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue @@ -550,16 +550,18 @@ export default { return strStyle + arr.join('') }, printExcel(jo) { - debugger - const j = Math.ceil(jo.detail_count / jo.shd_dtl_num) - for (let i = 0; i < j; i++) { - download('/api/checkoutbill/downloadExcel', { 'iostorinv_id': jo.iostorinv_id, 'j': i }).then(result => { - downloadFile(result, '', 'xlsx') - crud.downloadLoading = false - }).catch(() => { - crud.downloadLoading = false - }) - } + checkoutbill.getDisNum({ 'iostorinv_id': jo.iostorinv_id }).then(res => { + debugger + const j = Math.ceil(res.num / jo.shd_dtl_num) + for (let i = 0; i < j; i++) { + download('/api/checkoutbill/downloadExcel', { 'iostorinv_id': jo.iostorinv_id, 'j': i }).then(result => { + downloadFile(result, '', 'xlsx') + crud.downloadLoading = false + }).catch(() => { + crud.downloadLoading = false + }) + } + }) } } } From bd2d06c497611bbc0d4ec220432f834decd8ccf8 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Fri, 25 Nov 2022 17:51:57 +0800 Subject: [PATCH 3/5] NDC --- .../auto/run/NDCSocketConnectionAutoRun.java | 245 ++++++++++++++++++ .../run/OneNDCSocketConnectionAutoRun.java | 32 +-- .../agv/ndcone/AgvNdcOneDeviceDriver.java | 86 ++---- .../agv/ndctwo/AgvNdcTwoDeviceDriver.java | 232 +++++++++++------ .../rest/InstructionController.java | 8 + .../service/InstructionService.java | 7 + .../service/impl/InstructionServiceImpl.java | 54 ++++ .../src/api/acs/instruction/instruction.js | 10 +- .../src/views/acs/instruction/index.vue | 12 + 9 files changed, 527 insertions(+), 159 deletions(-) create mode 100644 acs/nladmin-system/src/main/java/org/nl/acs/auto/run/NDCSocketConnectionAutoRun.java diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/NDCSocketConnectionAutoRun.java b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/NDCSocketConnectionAutoRun.java new file mode 100644 index 000000000..c2ca0223a --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/NDCSocketConnectionAutoRun.java @@ -0,0 +1,245 @@ +package org.nl.acs.auto.run; + +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import lombok.extern.slf4j.Slf4j; +import org.nl.acs.AcsConfig; +import org.nl.acs.agv.server.NDCAgvService; +import org.nl.acs.device.service.DeviceService; +import org.nl.acs.device_driver.basedriver.agv.ndcone.AgvNdcOneDeviceDriver; +import org.nl.acs.device_driver.basedriver.agv.ndctwo.AgvNdcTwoDefination; +import org.nl.acs.device_driver.basedriver.agv.ndctwo.AgvNdcTwoDeviceDriver; +import org.nl.acs.ext.wms.service.AcsToWmsService; +import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl; +import org.nl.acs.instruction.service.InstructionService; +import org.nl.acs.instruction.service.dto.Instruction; +import org.nl.acs.instruction.service.impl.InstructionServiceImpl; +import org.nl.acs.opc.Device; +import org.nl.acs.opc.DeviceAppService; +import org.nl.modules.system.service.ParamService; +import org.nl.modules.system.service.impl.ParamServiceImpl; +import org.nl.modules.wql.util.SpringContextHolder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.net.Socket; +import java.util.Date; + +import static org.nl.acs.agv.server.impl.NDCAgvServiceImpl.Bytes2HexString; + +@Slf4j +@Component +public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { + + Socket s; + String ip = "127.0.0.1"; + int port = 1234; + static DataOutputStream dos; + static DataInputStream dis; + private int recordTimeOut = 10000; + private Date recordTime; + String[] ERROR = new String[]{ + "货叉尖部传感器触发", "S300传感器触发", "载货状态改变", "急停按钮触发", "触边开关出发", "需要复位", + "停在充电位", "取货失败", "放货失败", "轮子打滑", "没有动作码不能进入站点", "取货时有货", "丢失定位", + "抬叉停止"}; + boolean bConnected = true; + + boolean isReConnect = false; + + + @Autowired + AutoRunService autoRunService; + + + public NDCSocketConnectionAutoRun() { + this.recordTime = new Date((new Date()).getTime() - (long) this.recordTimeOut); + } + + public String getCode() { + return NDCSocketConnectionAutoRun.class.getSimpleName(); + } + + public String getName() { + return "NDC在线连接"; + } + + public void autoRun() { + + try { + System.out.println("OneAgv链接开始"); + ParamService paramService = SpringContextHolder.getBean(ParamServiceImpl.class); + InstructionService instructionService = SpringContextHolder.getBean(InstructionServiceImpl.class); + AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsServiceImpl.class); + NDCAgvService ndcAgvService = SpringContextHolder.getBean(NDCAgvService.class); + DeviceAppService deviceAppService = SpringContextHolder.getBean(DeviceAppService.class); + DeviceService deviceService = SpringContextHolder.getBean(DeviceService.class); + ip = paramService.findByCode(AcsConfig.AGVURL).getValue(); + port = Integer.parseInt(paramService.findByCode(AcsConfig.AGVPORT).getValue()); + byte[] b = new byte[1028]; + s = new Socket(ip, port); + System.out.println("Agv链接成功"); + dos = new DataOutputStream(s.getOutputStream()); + dis = new DataInputStream(s.getInputStream()); + + while (bConnected) { + int count = dis.read(b); + + if (count == -1) { + break; + } + + int[] arr = new int[count]; + StringBuffer bs = new StringBuffer(); + + for (int i = 0; i < count; i++) { + int temp = b[i]; + if (temp < 0) + temp += 256; + arr[i] = temp; + StringBuffer bs1 = new StringBuffer("0"); + bs.append(temp < 16 ? bs1.append(Integer.toHexString(temp)) : Integer.toHexString(temp)); + } + + System.out.println("收到请求参数：" + bs); + boolean flag = false; + if (arr[8] * 256 + arr[9] == 0x73) { + byte[] data = null; + System.out.println("接收agv上报信息：" + bs); + //执行阶段 + int phase = arr[16] * 256 + arr[17]; + // agv任务号 + int index = arr[12] * 256 + arr[13]; + //任务号 + int ikey = arr[26] * 256 + arr[27]; + //站点号 + int agvaddr = arr[18] * 256 + arr[19]; + //车号 + int carno = arr[20]; + Instruction inst = null; + if (ikey != 0) { + inst = instructionService.findByCodeFromCache(String.valueOf(ikey)); + } + log.info("接收agv上报信息：" + bs); + log.info("接收agv上报信息：" + "phase--" + phase + " index--" + index + " ikey--" + ikey + " agvaddr--" + agvaddr + " Car--" + carno); + Device device = null; + String device_code = null; + String old_device_code = null; + String emptyNum = null; + if (agvaddr != 0) { + old_device_code = deviceService.queryDeviceCodeByAddress(agvaddr); + if (StrUtil.contains(old_device_code, "-")) { + String[] point = old_device_code.split("-"); + device_code = point[0]; + } else if (StrUtil.contains(old_device_code, ".")) { + String[] point = old_device_code.split("\\."); + device_code = point[0]; + emptyNum = point[1]; + } else { + device_code = old_device_code; + } + device = deviceAppService.findDeviceByCode(device_code); + } + + AgvNdcTwoDeviceDriver agvNdcTwoDeviceDriver; + //开始任务 + if (phase == 0x01) { + if (!ObjectUtil.isEmpty(inst)) { + inst.setInstruction_status("1"); + inst.setAgv_jobno(String.valueOf(index)); + inst.setSend_status("1"); + instructionService.update(inst); + data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); + } + flag = true; + } + //任务完毕 + //（无车id及状态） + else if (phase == 0x14) { + if (ObjectUtil.isEmpty(inst)) { + log.info("未找到指令号{}对应的指令", ikey); + break; + } + inst.setInstruction_status("2"); + instructionService.finish(inst); + data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); + } + //请求删除任务 + //(需要WCS反馈) + else if (phase == 0x30) { + if (ObjectUtil.isEmpty(inst)) { + log.info("未找到指令号{}对应的指令", ikey); + break; + } + data = ndcAgvService.sendAgvTwoModeInst(0x8F, index, 0); + } + //任务删除确认 + //(需要WCS反馈) + else if (phase == 0xFF) { + if (ObjectUtil.isEmpty(inst)) { + log.info("未找到指令号{}对应的指令", ikey); + break; + } + instructionService.cancel(inst.getInstruction_id()); + data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); + } else { + //上报异常信息 + //（不需要WCS反馈） + if(phase == 0x67){ + device = deviceAppService.findDeviceByCode(Integer.toString(arr[27])); + } else { + device = deviceAppService.findDeviceByCode(Integer.toString(arr[20])); + } + if (device.getDeviceDriver() instanceof AgvNdcTwoDeviceDriver) { + agvNdcTwoDeviceDriver = (AgvNdcTwoDeviceDriver) device.getDeviceDriver(); + agvNdcTwoDeviceDriver.processSocket(arr); + } + } + if (!ObjectUtil.isEmpty(data)) { + write(data); + } + + } else { + System.out.println("agv上报不是0073类型动作，不处理"); + } + } + + } catch (Exception e) { + + + } finally { + + + } + + } + + + @Override + public void stop() { + super.after(); + try { + s.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + + public static void write(byte[] b) { + try { + log.info("下发agv数据:" + Bytes2HexString(b)); + System.out.println("下发agv数据:" + Bytes2HexString(b)); + dos.write(b); + dos.flush(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java index 3d1d66282..f84f92106 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java @@ -79,7 +79,6 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable { try { - byte[] b = new byte[1024]; s = new Socket(ip, port); dos = new DataOutputStream(s.getOutputStream()); @@ -150,9 +149,10 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable { instructionService.update(inst); } data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - - - } else if (phase == 0x0A) { + } + //任务完毕 + //（无车id及状态） + else if (phase == 0x0A) { for (Instruction inst : insts) { if (!ObjectUtil.isEmpty(inst)) { @@ -161,10 +161,16 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable { } data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } else if(phase == 0x30){ - data = NDCAgvService.sendAgvOneModeInst(143, index, 0); + } + //请求删除任务 + //(需要WCS反馈) + else if(phase == 0x30){ + data = NDCAgvService.sendAgvOneModeInst(0x8F, index, 0); - } else if(phase == 0xFF) { + } + //任务删除确认 + //(需要WCS反馈) + else if(phase == 0xFF) { for (Instruction inst : insts) { if (!ObjectUtil.isEmpty(inst)) { @@ -173,15 +179,9 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable { } data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - }else if(phase == 0x50){//离开区域 - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - - }else if(phase == 0x51){//离开区域 - - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } else { - + //上报异常信息 + //（不需要WCS反馈） if(phase == 0x67){ device = deviceAppService.findDeviceByCode(Integer.toString(arr[27])); } else { @@ -197,7 +197,7 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable { } } else { -// System.out.println("agv上报不是0073类型动作，不处理"); + System.out.println("agv上报不是0073类型动作，不处理"); } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java index b7a2bc4a5..f472e1403 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java @@ -25,7 +25,6 @@ import org.nl.acs.opc.DeviceAppService; import org.nl.modules.system.service.ParamService; import org.nl.modules.system.service.impl.ParamServiceImpl; import org.nl.modules.wql.util.SpringContextHolder; -import org.springframework.beans.factory.annotation.Autowired; import java.util.List; @@ -109,7 +108,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic //货架 StandardStorageDeviceDriver standardStorageDeviceDriver; - //开始任务/上报订单号 + //分配 车id + //(不需要WCS反馈) if (phase == 0x02) { for (Instruction inst : insts) { inst.setCarno(String.valueOf(carno)); @@ -117,7 +117,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic } logServer.deviceExecuteLog(this.device_code, "", "", "agvphase：" + "反馈:" + data); - //请求取货 + //到达取货点 + //(需要WCS反馈) } else if (phase == 0x03) { if (agvaddr == 0) { agvaddr = agvaddr_copy; @@ -167,34 +168,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic } logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); } - - } else if (phase == 0x65) {//param,重量待定 - //1、得到重量信息 - int weight = (arr[18] * 256 + arr[19]) * 10; - for (Instruction inst : insts) { - //校验agv上报站点编号与指令起始点相同 - if (ObjectUtil.isEmpty(inst)) { - log.info("未找到关联编号{}对应的指令", ikey); - break; - } - // 4010 待处理 - if (StrUtil.equals(inst.getStart_device_code(), device_code)) { - inst.setWeight(String.valueOf(weight)); - } - } - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - - logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); - - //取货完毕/取满框完毕1/点对点取货完毕 - } else if (phase == 0x64) {//param,agv货位id待定 - //1、根据货位id找到对应三工位设备，赋给agv属性地址对应的满料位设备 - agvaddr = arr[18] * 256 + arr[19]; - agvaddr_copy = agvaddr; - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); - //取货完毕 + //(需要WCS反馈) } else if (phase == 0x05) { if (agvaddr == 0) { agvaddr = agvaddr_copy; @@ -248,7 +223,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic } logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); - //请求放货 + //到达放货点 + //(需要WCS反馈) } else if (phase == 0x07) { if (agvaddr == 0) { agvaddr = agvaddr_copy; @@ -298,7 +274,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic } logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); - //放货完成 + //放货完毕 + //(需要WCS反馈) } else if (phase == 0x09) { if (agvaddr == 0) { agvaddr = agvaddr_copy; @@ -348,36 +325,21 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic } logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); - } else if (phase == 0x71) { - x = ikey; - if (x != last_x) { - logServer.deviceExecuteLog(this.device_code,"", "x", String.valueOf(x)); - } - } else if (phase == 0x72) { - y = ikey; - if (y != last_y) { - logServer.deviceExecuteLog(this.device_code, "","y", String.valueOf(y)); - } - } else if (phase == 0x73) { - angle = last_angle; - if (angle != last_angle) { - logServer.deviceExecuteLog(this.device_code, "","angle", String.valueOf(angle)); - } - } else if (phase == 0x74) { - electric_qty = ikey; - if (electric_qty != last_electric_qty) { - logServer.deviceExecuteLog(this.device_code, "","electric_qty", String.valueOf(electric_qty)); - } - } else if (phase == 0x75) { - status = ikey; - if (status != last_status) { - logServer.deviceExecuteLog(this.device_code, "","status", String.valueOf(status)); - } - } else if (phase == 0x76) { - error = ikey; - if (error != last_error) { - logServer.deviceExecuteLog(this.device_code, "","error", String.valueOf(error)); - } + } + //到达位置点 + //(需要WCS反馈) + else if (phase == 0x64) {//param,agv货位id待定 + //1、根据货位id找到对应三工位设备，赋给agv属性地址对应的满料位设备 + agvaddr = arr[18] * 256 + arr[19]; + agvaddr_copy = agvaddr; + data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); + logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); + }else if(phase == 0x50){//进入交通灯区域 + data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); + logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); + }else if(phase == 0x51){//离开交通灯区域 + data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); + logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); } if (!ObjectUtil.isEmpty(data)) { logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java index 9624ce030..ec0265186 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.agv.server.NDCAgvService; -import org.nl.acs.auto.run.TwoNDCSocketConnectionAutoRun; +import org.nl.acs.auto.run.NDCSocketConnectionAutoRun; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; @@ -25,10 +25,9 @@ import org.nl.acs.opc.DeviceAppService; import org.nl.modules.system.service.ParamService; import org.nl.modules.wql.util.SpringContextHolder; -import java.util.List; /** - * NDC单工位AGV + * NDC双工位AGV */ @Slf4j @Data @@ -38,29 +37,17 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic ParamService ParamService = SpringContextHolder.getBean(ParamService.class); InstructionService instructionService = SpringContextHolder.getBean(InstructionServiceImpl.class); AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsServiceImpl.class); - NDCAgvService NDCAgvService = SpringContextHolder.getBean(NDCAgvService.class); + NDCAgvService ndcAgvService = SpringContextHolder.getBean(NDCAgvService.class); DeviceExecuteLogService logServer = SpringContextHolder.getBean(DeviceExecuteLogService.class); DeviceAppService deviceAppService = SpringContextHolder.getBean(DeviceAppService.class); DeviceService deviceService = SpringContextHolder.getBean(DeviceService.class); int agvaddr = 0; int agvaddr_copy = 0; int weight = 0; + int agv_power = 0; String device_code = ""; int phase = 0; - - int x = 0; //x坐标 - int y = 0; //y坐标 - int angle = 0; //角度 - int electric_qty = 0; //电量 - int status = 0; //三色灯状态 - int error = 0; //车辆故障 - - int last_x = 0; - int last_y = 0; - int last_angle = 0; - int last_electric_qty = 0; - int last_status = 0; - int last_error = 0; + int region = 0; @LokiLog(type = LokiLogType.ACA_TO_LMS) public synchronized void processSocket(int[] arr) throws Exception { @@ -105,87 +92,172 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic } device = deviceAppService.findDeviceByCode(device_code); - if (phase == 0x67) { - //故障信息 - if (arr[18] * 256 + arr[19] == 0) { - - } - data = NDCAgvService.sendAgvTwoModeInst(phase, index, 0); - } - //普通站点 StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; //货架 StandardStorageDeviceDriver standardStorageDeviceDriver; - //开始任务/上报订单号 if (phase == 0x02) { + if (ObjectUtil.isEmpty(inst)) { + log.info("未找到指令号{}对应的指令", ikey); + return; + } inst.setCarno(String.valueOf(carno)); instructionService.update(inst); logServer.deviceExecuteLog(this.device_code, "", "", "agvphase：" + "反馈:" + data); - - //请求取货 - } else if (phase == 0x03) { - //判断普通站点驱动是否开启等待 - if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver(); - if(StrUtil.equals("true",this.getDevice().getExtraValue().get("max_emptypalletnum").toString())){ - if(standardOrdinarySiteDeviceDriver.getStatus() == 1){ - data = NDCAgvService.sendAgvTwoModeInst(phase, index, 0); - logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); - } else { - logServer.deviceExecuteLog(this.device_code, "", "", "上位系统未允许取货"); - } - } else { - data = NDCAgvService.sendAgvTwoModeInst(phase, index, 0); - logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); - } + } + //到达取货点 + //(Itype=1/2/3,需要WCS反馈Phase) + else if (phase == 0x03) { + if (ObjectUtil.isEmpty(inst)) { + log.info("未找到指令号{}对应的指令", ikey); + return; + } + data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); + logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); + } + // 取货完毕 + //(Itype=1/2/3,需要WCS反馈Phase) + else if (phase == 0x05) { + if (ObjectUtil.isEmpty(inst)) { + log.info("未找到指令号{}对应的指令", ikey); + return; + } + data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); + logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); + } + //到达取货点(Itype=1、3，需要WCS反馈) + else if (phase == 0x08) { + if (ObjectUtil.isEmpty(inst)) { + log.info("未找到指令号{}对应的指令", ikey); + return; + } + String instruction_type = inst.getInstruction_type(); + if (StrUtil.equals(instruction_type, "1") || StrUtil.equals(instruction_type, "3")) { + data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); + logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); + } + } + // 取货完毕 + //(Itype=1、3,需要WCS反馈) + else if (phase == 0x0A) { + if (ObjectUtil.isEmpty(inst)) { + log.info("未找到指令号{}对应的指令", ikey); + return; + } + String instruction_type = inst.getInstruction_type(); + if (StrUtil.equals(instruction_type, "1") || StrUtil.equals(instruction_type, "3")) { + data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); + logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); } - - } else if (phase == 0x65) {//param,重量待定 - //1、得到重量信息 - int weight = (arr[18] * 256 + arr[19]) * 10; - - data = NDCAgvService.sendAgvTwoModeInst(phase, index, 0); - + } + //（Itype=1,上传称重数据） + else if (phase == 0x64) { + if (ObjectUtil.isEmpty(inst)) { + log.info("未找到指令号{}对应的指令", ikey); + return; + } + String instruction_type = inst.getInstruction_type(); + //上传称重数据 + if (StrUtil.equals(instruction_type, "1")) { + weight = arr[18] * 256 + arr[19]; + inst.setWeight(String.valueOf(weight)); + instructionService.update(inst); + data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); + logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); + } + } + // 到达放货点 + //（Itype=1/2/3,需要WCS反馈） + else if (phase == 0x0C) { + if (ObjectUtil.isEmpty(inst)) { + log.info("未找到指令号{}对应的指令", ikey); + return; + } + data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); + logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); + } + //放货完成 + //(Itype=1/2/3,需要WCS反馈) + else if (phase == 0x0E) { + if (ObjectUtil.isEmpty(inst)) { + log.info("未找到指令号{}对应的指令", ikey); + return; + } + data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); + logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); + } + //到达放货点 + //（Itype=1、3,需要WCS反馈） + else if (phase == 0x10) { + if (ObjectUtil.isEmpty(inst)) { + log.info("未找到指令号{}对应的指令", ikey); + return; + } + String instruction_type = inst.getInstruction_type(); + if (StrUtil.equals(instruction_type, "1") || StrUtil.equals(instruction_type, "3")) { + data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); + logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); + } + } + //放货完成 + //（Itype=1、3,需要WCS反馈） + else if (phase == 0x12) { + if (ObjectUtil.isEmpty(inst)) { + log.info("未找到指令号{}对应的指令", ikey); + return; + } + String instruction_type = inst.getInstruction_type(); + if (StrUtil.equals(instruction_type, "1") || StrUtil.equals(instruction_type, "3")) { + data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); + logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); + } + } + //上传AGV电量 + else if (phase == 0x73) { + if (ObjectUtil.isEmpty(inst)) { + log.info("未找到指令号{}对应的指令", ikey); + return; + } + agv_power = ikey; + data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); + } //进入区域（phase值） + else if (phase == 0x50) { + if (ObjectUtil.isEmpty(inst)) { + log.info("未找到指令号{}对应的指令", ikey); + return; + } + region = arr[18] * 256 + arr[19]; + data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); + logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); - } else if (phase == 0x64) {//param,agv货位id待定 - - //取货完毕 - } else if (phase == 0x05) { - - - } else if (phase == 0x07) { - - - } else if (phase == 0x09) { - - - } else if (phase == 0x71) { - - - } else if (phase == 0x72) { - - - } else if (phase == 0x73) { - - - } else if (phase == 0x74) { - - - } else if (phase == 0x75) { - - - } else if (phase == 0x76) { + } + //离开区域（phase值） + else if (phase == 0x51) { + if (ObjectUtil.isEmpty(inst)) { + log.info("未找到指令号{}对应的指令", ikey); + return; + } + region = arr[18] * 256 + arr[19]; + data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); + logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); + } + //上报异常信息 + //（不需要WCS反馈） + else if (phase == 0x67) { + //故障信息 + if (arr[18] * 256 + arr[19] == 0) { + } + logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); } if (!ObjectUtil.isEmpty(data)) { logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data); - TwoNDCSocketConnectionAutoRun.write(data); + NDCSocketConnectionAutoRun.write(data); } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/rest/InstructionController.java b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/rest/InstructionController.java index 644f97175..841741cf1 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/rest/InstructionController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/rest/InstructionController.java @@ -108,6 +108,14 @@ public class InstructionController { return new ResponseEntity<>(HttpStatus.OK); } + @Log("强制取消指令") + @ApiOperation("强制取消指令") + @PostMapping(value = "/forceCancel/{id}") + public ResponseEntity forceCancel(@RequestBody String id) throws Exception { + instructionService.forceCancel(id); + return new ResponseEntity<>(HttpStatus.OK); + } + @Log("导出指令") @ApiOperation("导出指令") @GetMapping(value = "/download") diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java index feeb0221a..bda5d43c5 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java @@ -164,6 +164,13 @@ public interface InstructionService { */ void cancel(String id) throws Exception; + /** + * 取消指令 + * + * @param id + */ + void forceCancel(String id) throws Exception; + /** * 取消指令不下发agv * diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index cc96d9210..e035ab86f 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -833,6 +833,60 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu } } + @Override + public void forceCancel(String id) throws Exception { + //flag= true时取消指令 + boolean flag = false; + Instruction entity = this.findById(id); + if (entity == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } + TaskDto task = taskService.findByCodeFromCache(entity.getTask_code()); + if (StrUtil.isEmpty(entity.getRoute_plan_code())) { + entity.setRoute_plan_code(task.getRoute_plan_code()); + } + String currentUsername = SecurityUtils.getCurrentUsername(); + String now = DateUtil.now(); + entity.setUpdate_time(now); + entity.setUpdate_by(currentUsername); + entity.setInstruction_status("3"); + WQLObject wo = WQLObject.getWQLObject("acs_instruction"); + JSONObject json = (JSONObject) JSONObject.toJSON(entity); + wo.update(json); + DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); + DeviceService deviceService = SpringContextHolder.getBean(DeviceServiceImpl.class); + // 如果是无光电的设备 指令完成变更起点、终点状态 + JSONObject jo = new JSONObject(); + jo.put("device_code", entity.getStart_device_code()); + if (StrUtil.equals(entity.getMaterial(), "1")) { + jo.put("hasGoodStatus", "1"); + } else if (!StrUtil.equals(entity.getMaterial(), "1") && !StrUtil.isEmpty(entity.getMaterial())) { + jo.put("hasGoodStatus", "2"); + } else { + jo.put("hasGoodStatus", "0"); + } + jo.put("material_type", entity.getMaterial()); + jo.put("batch", entity.getBatch()); + jo.put("islock", "false"); + deviceService.changeDeviceStatus(jo); + + JSONObject jo1 = new JSONObject(); + jo1.put("device_code", entity.getNext_device_code()); + jo.put("hasGoodStatus", "0"); + jo.put("material_type", ""); + jo.put("batch", ""); + jo1.put("islock", "false"); + deviceService.changeDeviceStatus(jo1); + + String instnextdevice = entity.getNext_device_code(); + Device device = appService.findDeviceByCode(instnextdevice); + if (device == null) { + log.debug("地址对应设备未找到"); + return; + } + removeByCodeFromCache(entity.getInstruction_code()); + } + @Override public void cancelNOSendAgv(String id) throws Exception { diff --git a/acs/nladmin-ui/src/api/acs/instruction/instruction.js b/acs/nladmin-ui/src/api/acs/instruction/instruction.js index 12aea742d..5d8bec045 100644 --- a/acs/nladmin-ui/src/api/acs/instruction/instruction.js +++ b/acs/nladmin-ui/src/api/acs/instruction/instruction.js @@ -40,6 +40,14 @@ export function cancel(instruction_id) { }) } +export function forceCancel(instruction_id) { + return request({ + url: 'api/instruction/forceCancel/' + instruction_id, + method: 'post', + data: instruction_id + }) +} + export function queryUnFinish() { return request({ url: 'api/instruction/unfinish/', @@ -62,4 +70,4 @@ export function reload() { }) } -export default { add, edit, del, finish, cancel, queryUnFinish, queryByTaskId, reload } +export default { add, edit, del, finish, cancel, forceCancel, queryUnFinish, queryByTaskId, reload } diff --git a/acs/nladmin-ui/src/views/acs/instruction/index.vue b/acs/nladmin-ui/src/views/acs/instruction/index.vue index 7e82e25db..8d57de0ef 100644 --- a/acs/nladmin-ui/src/views/acs/instruction/index.vue +++ b/acs/nladmin-ui/src/views/acs/instruction/index.vue @@ -160,6 +160,7 @@ 完成 取消 + 强制取消 @@ -290,6 +291,14 @@ export default { console.log(err.response.data.message) }) }, + forceCancel(index, row) { + crudInstruction.forceCancel(row.instruction_id).then(res => { + this.crud.toQuery() + this.crud.notify('强制取消成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + }).catch(err => { + console.log(err.response.data.message) + }) + }, reload() { crudInstruction.reload().then(res => { this.crud.toQuery() @@ -313,6 +322,9 @@ export default { case 'b':// 取消 this.cancel(command.index, command.row) break + case 'c':// 强制取消 + this.forceCancel(command.index, command.row) + break } } From e69be1bc25b6e01bc849131cbccb42bde45d3c5e Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 25 Nov 2022 18:08:38 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/st/outbill/service/impl/CheckOutBillServiceImpl.java | 1 + lms/nladmin-ui/src/views/wms/st/outbill/index.vue | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index a53458d4c..35e53ed97 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -2138,6 +2138,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { String cust_code = jsonMst.getString("cust_code"); JSONObject jsonCust = custTab.query("cust_code = '" + cust_code + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jsonCust)) throw new BadRequestException("客户不存在"); int j = Integer.parseInt((String) whereJson.get("j")); //1.根据出入库主表中 收货单位 查询客户表中的模板路径 diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue index ea426d10d..019a92060 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue @@ -551,11 +551,10 @@ export default { }, printExcel(jo) { checkoutbill.getDisNum({ 'iostorinv_id': jo.iostorinv_id }).then(res => { - debugger const j = Math.ceil(res.num / jo.shd_dtl_num) for (let i = 0; i < j; i++) { download('/api/checkoutbill/downloadExcel', { 'iostorinv_id': jo.iostorinv_id, 'j': i }).then(result => { - downloadFile(result, '', 'xlsx') + downloadFile(result, '发货单', 'xlsx') crud.downloadLoading = false }).catch(() => { crud.downloadLoading = false From 7aa3933a36d4b0ae4d2428f33d1b9c7f16ebe90f Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 25 Nov 2022 18:41:16 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CheckOutBillServiceImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index 35e53ed97..5bb9aa8ca 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -2172,6 +2172,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { int shd_dtl_num = jsonCust.getIntValue("shd_dtl_num"); // 送货单明细数 if (shd_dtl_num > dtlArr.size()) { + double all_qty = 0; ArrayList> flData = new ArrayList<>(); WriteSheet sheet = EasyExcel.writerSheet().build(); for (int i = 0; i < dtlArr.size(); i++) { @@ -2196,9 +2197,11 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { mapFL.put("material_spec", material_spec); mapFL.put("qty_unit_name", "KG"); mapFL.put("box_no", sub_box_no); - mapFL.put("qty", NumberUtil.round(json.getString("qty"), 2).toString()); + mapFL.put("qty", NumberUtil.round(json.getString("qty"), 2).doubleValue()); flData.add(mapFL); + all_qty = NumberUtil.add(String.valueOf(all_qty), json.getString("qty")).doubleValue(); } + oneMap.put("all_qty",all_qty); workBook.fill(oneMap, sheet); workBook.fill(new FillWrapper("data", flData), sheet); workBook.finish(); @@ -2207,6 +2210,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { double ceil = Math.ceil(div); Integer integer = Integer.valueOf(String.valueOf(NumberUtil.round(ceil, 0))); + double all_qty = 0; ArrayList> flData = new ArrayList<>(); for (int i = j * shd_dtl_num; i < (j + 1) * shd_dtl_num; i++) { if (i == dtlArr.size()) { @@ -2234,10 +2238,14 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { mapFL.put("material_spec", material_spec); mapFL.put("qty_unit_name", "KG"); mapFL.put("box_no", sub_box_no); - mapFL.put("qty", NumberUtil.round(json.getString("qty"), 2).toString()); + mapFL.put("qty", NumberUtil.round(json.getString("qty"), 2).doubleValue()); flData.add(mapFL); + // 计算合计重量 + all_qty = NumberUtil.add(String.valueOf(all_qty), json.getString("qty")).doubleValue(); + } + oneMap.put("all_qty",all_qty); WriteSheet sheet = EasyExcel.writerSheet(0).build(); workBook.fill(oneMap, sheet); workBook.fill(new FillWrapper("data", flData), sheet);