From 4f2bcc8cec6b88ec188b03b9b854909f6c525723 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Tue, 28 Jun 2022 18:30:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/pda/pdm/wql/QPF_SCREEN.wql | 4 + .../sb/core/rest/SparePartOutController.java | 9 + .../sb/core/service/SparePartOutService.java | 3 + .../service/impl/SparePartOutServiceImpl.java | 13 + .../wms/sb/core/wql/QEM_BI_SPAREPARTOUT.wql | 24 ++ .../impl/InAndOutRetrunServiceImpl.java | 2 + mes/qd/src/api/wms/sb/sparepartout.js | 52 +--- .../wms/pdm/base/productRoute/AddDialog.vue | 2 +- mes/qd/src/views/wms/sb/outbill/DivDialog.vue | 77 ++---- mes/qd/src/views/wms/sb/outbill/StructIvt.vue | 241 ++++++++++++++++++ 10 files changed, 333 insertions(+), 94 deletions(-) create mode 100644 mes/qd/src/views/wms/sb/outbill/StructIvt.vue diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/wql/QPF_SCREEN.wql b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/wql/QPF_SCREEN.wql index 403bc542..78f89583 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/wql/QPF_SCREEN.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/wql/QPF_SCREEN.wql @@ -104,6 +104,8 @@ LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id WHERE dtl.material_type = '01' + AND + dtl.is_need_manage = '1' OPTION 输入.formula_id <> "" dtl.formula_id = 输入.formula_id ENDOPTION @@ -123,6 +125,8 @@ LEFT JOIN md_pb_classstandard mb ON mb.class_id = dtl.material_id WHERE dtl.material_type = '02' + AND + dtl.is_need_manage = '1' OPTION 输入.formula_id <> "" dtl.formula_id = 输入.formula_id ENDOPTION diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/rest/SparePartOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/rest/SparePartOutController.java index 712a7d50..22e09eb9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/rest/SparePartOutController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/rest/SparePartOutController.java @@ -13,6 +13,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.Map; @RestController @@ -76,6 +77,14 @@ public class SparePartOutController { return new ResponseEntity<>(sparePartOutService.getDisDtl(whereJson), HttpStatus.OK); } + @PostMapping("/getStructIvt") + @Log("完成单据") + @ApiOperation("完成单据") + //@PreAuthorize("@el.check('materialtype:list')") + public ResponseEntity getStructIvt(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(sparePartOutService.getStructIvt(whereJson), HttpStatus.OK); + } + @PostMapping("/getIvt") @Log("查询备件库存") @ApiOperation("查询备件库存") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/service/SparePartOutService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/service/SparePartOutService.java index 0c2037af..dbe0e4c0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/service/SparePartOutService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/service/SparePartOutService.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.springframework.data.domain.Pageable; +import java.util.HashMap; import java.util.Map; public interface SparePartOutService { @@ -34,6 +35,8 @@ public interface SparePartOutService { JSONArray getDisDtl(JSONObject whereJson); + JSONArray getStructIvt(JSONObject whereJson); + JSONArray getIvt(JSONObject whereJson); void divStruct(JSONObject whereJson); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/service/impl/SparePartOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/service/impl/SparePartOutServiceImpl.java index d64fcd8b..a54f32ab 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/service/impl/SparePartOutServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/service/impl/SparePartOutServiceImpl.java @@ -206,6 +206,19 @@ public class SparePartOutServiceImpl implements SparePartOutService { return dtl_rows; } + @Override + public JSONArray getStructIvt(JSONObject whereJson) { + String search = (String) whereJson.get("search"); + HashMap map = new HashMap<>(); + map.put("flag", "12"); + map.put("material_id", whereJson.getString("material_id")); + if (StrUtil.isNotEmpty(search)){ + map.put("search", search); + } + JSONArray dtl_rows = WQL.getWO("QEM_BI_SPAREPARTOUT").addParamMap(map).process().getResultJSONArray(0); + return dtl_rows; + } + @Transactional(rollbackFor = Exception.class) @Override public void createCode(JSONObject form) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/wql/QEM_BI_SPAREPARTOUT.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/wql/QEM_BI_SPAREPARTOUT.wql index 4f774009..8b708716 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/wql/QEM_BI_SPAREPARTOUT.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/wql/QEM_BI_SPAREPARTOUT.wql @@ -30,6 +30,7 @@ 输入.iostorinvdtl_id TYPEAS s_string 输入.storagevehicle_code TYPEAS s_string 输入.iostorinv_id TYPEAS s_string + 输入.material_id TYPEAS s_string [临时表] @@ -464,6 +465,29 @@ ENDQUERY ENDIF + IF 输入.flag = "12" + QUERY + SELECT + sa.sect_name, + sa.struct_name, + ivt.sparepart_only_id, + mb.material_code, + mb.material_name, + ivt.pcsn, + ivt.ivt_qty, + ivt.qty_unit_name, + ivt.instorage_time + FROM + em_bi_devicesparepartivt ivt + LEFT JOIN st_ivt_structattr sa ON sa.struct_id = ivt.struct_id + LEFT JOIN md_me_materialbase mb ON mb.material_id = ivt.material_id + WHERE + ivt.material_id = 输入.material_id + ENDSELECT + ENDQUERY + ENDIF + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java index 2c36c3b7..9b4dd9d5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java @@ -980,8 +980,10 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { String batch_seq = jo.getString("pcsn"); List all = Db.use((DataSource) SpringContextHolder.getBean("dataSource1")).findAll(Entity.create("BATCH_SEQ").set("DR", "0").set("ITEM_ID", item_id).set("BATCH_SEQ", batch_seq)); if (ObjectUtil.isNotEmpty(all)) { + log.info(item_id+","+batch_seq+"批次主键为："+all.get(0).getStr("BATCH_ID")); return all.get(0).getStr("BATCH_ID"); } else { + log.info(item_id+","+batch_seq+"未查询到批次主键！"); return null; } } diff --git a/mes/qd/src/api/wms/sb/sparepartout.js b/mes/qd/src/api/wms/sb/sparepartout.js index de97afcc..77c89118 100644 --- a/mes/qd/src/api/wms/sb/sparepartout.js +++ b/mes/qd/src/api/wms/sb/sparepartout.js @@ -96,6 +96,14 @@ export function getDisDtl(data) { }) } +export function getStructIvt(data) { + return request({ + url: '/api/sb/outbill/getStructIvt', + method: 'post', + data + }) +} + export function createCode(data) { return request({ url: '/api/sb/outbill/createCode', @@ -144,46 +152,6 @@ export function bucketDtl(data) { }) } -export function updateTask(data) { - return request({ - url: '/api/sb/outbill/updateTask', - method: 'post', - data - }) -} - -export function delTask(data) { - return request({ - url: '/api/sb/outbill/delTask', - method: 'post', - data - }) -} - -export function reIssueTask(data) { - return request({ - url: '/api/sb/outbill/reIssueTask', - method: 'post', - data - }) -} - -export function confirmTask(data) { - return request({ - url: '/api/sb/outbill/confirmTask', - method: 'post', - data - }) -} - -export function cancelTask(data) { - return request({ - url: '/api/sb/outbill/cancelTask', - method: 'post', - data - }) -} - export function confirm(data) { return request({ url: '/api/sb/outbill/confirm', @@ -209,5 +177,5 @@ export function getIvt(data) { } export default { add, edit, del, getType, getBillDtl, disConfirm, insertDtl, getIODtl, commit, checkVehicle, - deleteDisDtl, getDisDtl, createCode, divPoint, cancelCreate, getIvt, - divStruct, bucketDtl, updateTask, delTask, reIssueTask, confirmTask, cancelTask, confirm, backConfirm } + deleteDisDtl, getDisDtl, createCode, divPoint, cancelCreate, getIvt, getStructIvt, + divStruct, bucketDtl, confirm, backConfirm } diff --git a/mes/qd/src/views/wms/pdm/base/productRoute/AddDialog.vue b/mes/qd/src/views/wms/pdm/base/productRoute/AddDialog.vue index b8abcf83..cfbbd1be 100644 --- a/mes/qd/src/views/wms/pdm/base/productRoute/AddDialog.vue +++ b/mes/qd/src/views/wms/pdm/base/productRoute/AddDialog.vue @@ -197,7 +197,7 @@ export default { crudProductRoute.getProductRouteDtl(this.form).then(res => { this.form.tableData = res }) - this.form.product_series = this.dict.label.product_series[this.form.product_series] + // this.form.product_series = this.dict.label.product_series[this.form.product_series] }, handleClose(done) { this.$confirm('确认关闭？') diff --git a/mes/qd/src/views/wms/sb/outbill/DivDialog.vue b/mes/qd/src/views/wms/sb/outbill/DivDialog.vue index d6ddd2b1..22590055 100644 --- a/mes/qd/src/views/wms/sb/outbill/DivDialog.vue +++ b/mes/qd/src/views/wms/sb/outbill/DivDialog.vue @@ -56,10 +56,8 @@ - - + + @@ -86,7 +84,7 @@ type="warning" icon="el-icon-check" size="mini" - @click="createCode()" + @click="openStructIvt()" > 手动分配 @@ -100,16 +98,6 @@ > 删除分配 - - 确认 - @@ -134,19 +122,19 @@ - +