From fd55d712616d20491c984bc300e65485570bbb88 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 6 Jan 2023 18:26:47 +0800 Subject: [PATCH] =?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 --- .../java/org/nl/wms/basedata/st/wql/stivt.xls | Bin 307200 -> 307712 bytes .../wms/pda/st/rest/PdaCheckController.java | 21 ++ .../wms/pda/st/service/PdaCheckService.java | 20 ++ .../st/service/impl/PdaCheckServiceImpl.java | 108 +++++++ .../java/org/nl/wms/pda/st/wql/PDA_CHECK.wql | 48 ++- .../wms/st/instor/rest/CheckController.java | 21 ++ .../wms/st/instor/service/CheckService.java | 23 ++ .../instor/service/impl/CheckServiceImpl.java | 172 ++++++++--- .../nl/wms/st/instor/wql/QST_IVT_CHECK.wql | 59 ++++ .../views/wms/st/inStor/check/AddDialog.vue | 35 ++- .../src/views/wms/st/inStor/check/AddDtl.vue | 43 ++- .../views/wms/st/inStor/check/CheckDialog.vue | 86 +++--- .../wms/st/inStor/check/DtlViewDialog.vue | 141 +++++++++ .../wms/st/inStor/check/ProcessDialog.vue | 289 ++++++------------ .../src/views/wms/st/inStor/check/check.js | 9 +- .../src/views/wms/st/inStor/check/index.vue | 30 +- 16 files changed, 781 insertions(+), 324 deletions(-) create mode 100644 lms/nladmin-ui/src/views/wms/st/inStor/check/DtlViewDialog.vue diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls index eb0467b6837894e528fc5f8cad3898b3bb83e115..7c97e93ff68111eff45ed538904b02a2cc1fabd1 100644 GIT binary patch delta 20613 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 kM3?J?RuDTOI(R0e4 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 q=-(pdaCheckService.checkQueryDtl(whereJson),HttpStatus.OK); } + @PostMapping("/checkQueryDetails") + @Log("盘点单明细详情") + @ApiOperation("盘点单明细详情") + public ResponseEntity checkQueryDetails(@RequestBody JSONObject whereJson){ + return new ResponseEntity<>(pdaCheckService.checkQueryDetails(whereJson),HttpStatus.OK); + } + @PostMapping("/saveCheck") @Log("保存") @ApiOperation("保存") @@ -57,6 +64,20 @@ public class PdaCheckController { return new ResponseEntity<>(pdaCheckService.confirmCheck(whereJson),HttpStatus.OK); } + @PostMapping("/exception") + @Log("异常") + @ApiOperation("异常") + public ResponseEntity exception(@RequestBody JSONObject whereJson){ + return new ResponseEntity<>(pdaCheckService.exception(whereJson),HttpStatus.OK); + } + + @PostMapping("/normal") + @Log("正常") + @ApiOperation("正常") + public ResponseEntity normal(@RequestBody JSONObject whereJson){ + return new ResponseEntity<>(pdaCheckService.normal(whereJson),HttpStatus.OK); + } + @PostMapping("/getStor") @Log("获取人员对应仓库下拉框") @ApiOperation("获取人员对应仓库下拉框") diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/PdaCheckService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/PdaCheckService.java index 1dcfbc3d7..ab896cd2b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/PdaCheckService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/PdaCheckService.java @@ -44,4 +44,24 @@ public interface PdaCheckService { * @return JSONObject / */ JSONObject getStor(); + + /** + * 获取人员对应仓库下拉框 + * @return JSONObject / + */ + JSONObject checkQueryDetails(JSONObject whereJson); + + /** + * 异常 + * @param whereJson / + * @return JSONObject / + */ + JSONObject exception(JSONObject whereJson); + + /** + * 正常 + * @param whereJson / + * @return JSONObject / + */ + JSONObject normal(JSONObject whereJson); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PdaCheckServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PdaCheckServiceImpl.java index fd4df307f..c17caa8bf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PdaCheckServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PdaCheckServiceImpl.java @@ -2,11 +2,14 @@ package org.nl.wms.pda.st.service.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.druid.sql.visitor.functions.If; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.common.utils.SecurityUtils; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl; @@ -141,4 +144,109 @@ public class PdaCheckServiceImpl implements PdaCheckService { return jo; } + @Override + public JSONObject checkQueryDetails(JSONObject whereJson) { + JSONObject map = new JSONObject(); + map.put("flag", "3"); + map.put("storagevehicle_code", whereJson.getString("storagevehicle_code")); + JSONArray resultJSONArray = WQL.getWO("PDA_CHECK").addParamMap(map).process().getResultJSONArray(0); + + JSONObject jo = new JSONObject(); + jo.put("data", resultJSONArray); + jo.put("message", "查询成功!"); + return jo; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public JSONObject exception(JSONObject whereJson) { + //主表 + WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_CheckMst"); + //明细表 + WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_CheckDtl"); + + String currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + + JSONArray rows = whereJson.getJSONArray("check_rows"); + String check_code = ""; + + for (int i = 0; i < rows.size(); i++) { + JSONObject json = rows.getJSONObject(i); + check_code = json.getString("check_code"); + + JSONObject jsonDtl = wo_dtl.query("checkdtl_id = '" + json.getString("checkdtl_id") + "'").uniqueResult(0); + jsonDtl.put("check_result", "2"); + jsonDtl.put("status", "4"); + jsonDtl.put("is_process", "0"); + jsonDtl.put("remark", json.getString("remark")); + jsonDtl.put("check_optid", currentUserId); + jsonDtl.put("check_optname", nickName); + jsonDtl.put("check_time", now); + wo_dtl.update(jsonDtl); + } + + JSONArray jsonDtlArr = wo_dtl.query("check_code = '" + check_code + "' and check_result = '2'").getResultJSONArray(0); + + JSONObject jsonMst = wo_mst.query("check_code = '" + check_code + "'").uniqueResult(0); + jsonMst.put("status", "3"); + if (ObjectUtil.isNotEmpty(jsonDtlArr)) { + jsonMst.put("is_nok", "1"); + } + wo_mst.update(jsonMst); + + JSONObject result = new JSONObject(); + result.put("message", "操作成功!"); + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public JSONObject normal(JSONObject whereJson) { + //主表 + WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_CheckMst"); + //明细表 + WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_CheckDtl"); + + String currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + + JSONArray rows = whereJson.getJSONArray("check_rows"); + String check_code = ""; + + for (int i = 0; i < rows.size(); i++) { + JSONObject json = rows.getJSONObject(i); + check_code = json.getString("check_code"); + + JSONObject jsonDtl = wo_dtl.query("checkdtl_id = '" + json.getString("checkdtl_id") + "'").uniqueResult(0); + jsonDtl.put("check_result", "1"); + jsonDtl.put("is_process", "1"); + jsonDtl.put("status", "3"); + jsonDtl.put("remark", json.getString("remark")); + jsonDtl.put("check_optid", currentUserId); + jsonDtl.put("check_optname", nickName); + jsonDtl.put("check_time", now); + wo_dtl.update(jsonDtl); + } + + JSONArray jsonDtlArr = wo_dtl.query("check_code = '" + check_code + "' and check_result = '1'").getResultJSONArray(0); + JSONArray jsonDtlArr2 = wo_dtl.query("check_code = '" + check_code + "'").getResultJSONArray(0); + + JSONObject jsonMst = wo_mst.query("check_code = '" + check_code + "'").uniqueResult(0); + jsonMst.put("status", "3"); + if (jsonDtlArr.size() == jsonDtlArr2.size()) { + jsonMst.put("status", "99"); + jsonMst.put("confirm_optid", currentUserId); + jsonMst.put("confirm_optname", nickName); + jsonMst.put("confirm_time", now); + } + + wo_mst.update(jsonMst); + JSONObject result = new JSONObject(); + result.put("message", "操作成功!"); + return result; + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_CHECK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_CHECK.wql index 015c20d80..f3e33c2fe 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_CHECK.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_CHECK.wql @@ -17,6 +17,7 @@ 输入.check_code TYPEAS s_string 输入.in_stor_id TYPEAS f_string 输入.stor_id TYPEAS s_string + 输入.storagevehicle_code TYPEAS s_string [临时表] @@ -122,12 +123,12 @@ CASE dtl.check_result WHEN '1' THEN '正常' - WHEN '2' THEN '盘亏' - WHEN '3' THEN '盘盈' + WHEN '2' THEN '异常' END ) AS check_result, dtl.check_optname, dtl.check_time, + dtl.remark, dtl.check_id, dtl.checkdtl_id @@ -135,7 +136,7 @@ ST_IVT_CheckDtl dtl LEFT JOIN md_me_materialbase mater ON dtl.material_id = mater.material_id WHERE - 1=1 + dtl.status = '1' OPTION 输入.check_code <> "" dtl.check_code = 输入.check_code @@ -144,3 +145,44 @@ ENDSELECT ENDQUERY ENDIF + + IF 输入.flag = "3" + QUERY + SELECT + sub.container_name, + sub.sap_pcsn, + sub.net_weight, + ( + CASE + sub.status + WHEN '0' THEN '生成' + WHEN '1' THEN '包装' + WHEN '2' THEN '入库' + WHEN '3' THEN '出库' + END + ) AS status, + sub.sale_order_name, + sub.customer_name, + sub.customer_description, + sub.width, + sub.thickness, + sub.length, + sub.width_standard, + sub.thickness_request, + sub.quality_guaran_period, + sub.date_of_production, + sub.date_of_fg_inbound + FROM + st_ivt_structivt ivt + LEFT JOIN st_ivt_structattr attr ON ivt.struct_id = attr.struct_id + LEFT JOIN pdm_bi_subpackagerelation sub ON ivt.pcsn = sub.container_name AND sub.package_box_sn = attr.storagevehicle_code + WHERE + 1=1 + + OPTION 输入.storagevehicle_code <> "" + sub.package_box_sn = 输入.storagevehicle_code + ENDOPTION + + ENDSELECT + ENDQUERY + ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/CheckController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/CheckController.java index eb2ca4d72..4fdda41a3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/CheckController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/CheckController.java @@ -31,6 +31,20 @@ public class CheckController { return new ResponseEntity<>(checkService.pageQuery(whereJson,page), HttpStatus.OK); } + @GetMapping("/getDtlView") + @Log("查询盘点单明细详情") + @ApiOperation("查询盘点单明细详情") + public ResponseEntity getDtlView(@RequestParam Map whereJson, Pageable page){ + return new ResponseEntity<>(checkService.getDtlView(whereJson,page), HttpStatus.OK); + } + + @GetMapping("/getExceptionDispose") + @Log("查询盘点单明细异常") + @ApiOperation("查询盘点单明细异常") + public ResponseEntity getExceptionDispose(@RequestParam Map whereJson, Pageable page){ + return new ResponseEntity<>(checkService.getExceptionDispose(whereJson,page), HttpStatus.OK); + } + @GetMapping("/getOutBillDtl") @Log("查询移库单") @ApiOperation("查询移库单") @@ -125,4 +139,11 @@ public class CheckController { public void download(HttpServletResponse response,@RequestParam Map whereJson) throws IOException { checkService.download(checkService.getOutBillDtl(whereJson), response); } + @PostMapping("/disposeConfirm") + @Log("处理确认") + @ApiOperation("处理确认") + public ResponseEntity disposeConfirm(@RequestBody JSONObject whereJson) { + checkService.disposeConfirm(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/CheckService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/CheckService.java index dd807de67..80ad22d3f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/CheckService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/CheckService.java @@ -18,6 +18,24 @@ public interface CheckService { */ Map pageQuery(Map whereJson, Pageable page); + /** + * 查询数据分页 + * + * @param whereJson 条件 + * @param page 分页参数 + * @return Map + */ + Map getDtlView(Map whereJson, Pageable page); + + /** + * 查询数据分页 + * + * @param whereJson 条件 + * @param page 分页参数 + * @return Map + */ + Map getExceptionDispose(Map whereJson, Pageable page); + /** * 多选删除 * @param ids / @@ -91,4 +109,9 @@ public interface CheckService { * @throws IOException */ void download(JSONArray rows, HttpServletResponse response) throws IOException; + + /** + * 处理确认 + */ + void disposeConfirm(JSONObject whereJson); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java index 6a66796a5..ef7ec4c14 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java @@ -1,6 +1,7 @@ package org.nl.wms.st.instor.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -59,6 +60,40 @@ public class CheckServiceImpl implements CheckService { return jo; } + @Override + public Map getDtlView(Map whereJson, Pageable page) { + String box_no = MapUtil.getStr(whereJson, "box_no"); + String pcsn = MapUtil.getStr(whereJson, "pcsn"); + String sap_pcsn = MapUtil.getStr(whereJson, "sap_pcsn"); + + JSONObject map = new JSONObject(); + map.put("box_no",box_no); + map.put("flag","9"); + + if (ObjectUtil.isNotEmpty(pcsn)) map.put("pcsn", "%"+pcsn+"%"); + if (ObjectUtil.isNotEmpty(sap_pcsn)) map.put("sap_pcsn", "%"+sap_pcsn+"%"); + + JSONObject json = WQL.getWO("QST_IVT_CHECK").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "sub.container_name ASC"); + + return json; + } + + @Override + public Map getExceptionDispose(Map whereJson, Pageable page) { + String box_no = MapUtil.getStr(whereJson, "box_no"); + String check_code = MapUtil.getStr(whereJson, "check_code"); + + JSONObject map = new JSONObject(); + map.put("check_code",check_code); + map.put("flag","10"); + + if (ObjectUtil.isNotEmpty(box_no)) map.put("box_no", "%"+box_no+"%"); + + JSONObject json = WQL.getWO("QST_IVT_CHECK").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "dtl.seq_no ASC"); + + return json; + } + @Override @Transactional(rollbackFor = Exception.class) public void deleteAll(Long[] ids) { @@ -149,11 +184,9 @@ public class CheckServiceImpl implements CheckService { jsonDtl.put("struct_name", json.getString("struct_name")); jsonDtl.put("storagevehicle_code", json.getString("storagevehicle_code")); jsonDtl.put("material_id", json.getLongValue("material_id")); - jsonDtl.put("base_qty", json.getDoubleValue("base_qty")); jsonDtl.put("qty_unit_id", json.getLongValue("measure_unit_id")); jsonDtl.put("qty_unit_name", json.getString("qty_unit_name")); jsonDtl.put("status", "1"); - jsonDtl.put("fac_qty", json.getDoubleValue("fac_qty")); dtlTab.insert(jsonDtl); } } @@ -266,6 +299,9 @@ public class CheckServiceImpl implements CheckService { if (StrUtil.isNotEmpty(map.get("struct_code"))) { map.put("struct_code", "%" + map.get("struct_code") + "%"); } + if (StrUtil.isNotEmpty(map.get("box_no"))) { + map.put("box_no", "%" + map.get("box_no") + "%"); + } JSONObject jo = WQL.getWO("QST_IVT_CHECK") .addParam("flag", "3") .addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "struct.struct_code"); @@ -282,64 +318,58 @@ public class CheckServiceImpl implements CheckService { JSONObject form = whereJson.getJSONObject("row"); JSONArray rows = whereJson.getJSONArray("rows"); + String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); - JSONObject jo_mst = wo_mst.query("status in ('1','3') and check_id='" + form.getString("check_id") + "'").uniqueResult(0); - if (jo_mst == null) { - throw new BadRequestException("盘点单状态异常！"); - } - wo_dtl.delete("status in ('1','2') and check_id='" + form.getString("check_id") + "'"); - //定义需要需要更新的的点位集合 + String check_id = form.getString("check_id"); + JSONObject jsonMst = wo_mst.query("check_id = '" + check_id + "'").uniqueResult(0); + + // 更新明细 for (int i = 0; i < rows.size(); i++) { - JSONObject jo = rows.getJSONObject(i); - String status = jo.getString("status"); - double base_qty = jo.getDoubleValue("base_qty"); - jo.put("seq_no", "" + (i + 1)); - //已盘点过的明细不再处理 - if ("3,4,5,99".contains(status)) { - wo_dtl.update(jo); - continue; - } - jo.put("status", "3"); - jo.put("check_optid", currentUserId); - jo.put("check_optname", nickName); - jo.put("check_time", now); - double fac_qty = jo.getDoubleValue("fac_qty"); - //判断盈亏 - if (fac_qty > base_qty) { - jo.put("check_result", "3"); - } else if (fac_qty < base_qty) { - jo.put("check_result", "2"); + JSONObject json = rows.getJSONObject(i); + JSONObject jsonDtl = wo_dtl.query("checkdtl_id = '" + json.getString("checkdtl_id") + "'").uniqueResult(0); + + String check_result = json.getString("check_result"); + if (ObjectUtil.isEmpty(check_result)) { + jsonDtl.put("check_result","1"); + jsonDtl.put("is_process","0"); + jsonDtl.put("status","3"); } else { - jo.put("check_result", "1"); + jsonDtl.put("check_result",check_result); + + if (StrUtil.equals(check_result, "1")) { + jsonDtl.put("is_process","1"); + jsonDtl.put("status","3"); + } else { + jsonDtl.put("is_process","0"); + jsonDtl.put("status","4"); + } } - jo.put("status", "99"); - wo_dtl.insert(jo); - } - jo_mst.put("dtl_num", rows.size()); - jo_mst.put("status", "3"); - jo_mst.put("is_nok", "0"); - JSONArray ja_nok = wo_dtl.query("check_result <>'1' and check_id='" + form.getString("check_id") + "'").getResultJSONArray(0); - if (ja_nok.size() != 0) { - jo_mst.put("is_nok", "1"); + + jsonDtl.put("remark", json.getString("remark")); + jsonDtl.put("check_optid", currentUserId); + jsonDtl.put("check_optname", nickName); + jsonDtl.put("check_time", now); + wo_dtl.update(jsonDtl); } - JSONArray ja = wo_dtl.query("status in ('99') and check_id='" + form.getString("check_id") + "'").getResultJSONArray(0); - //说明全部确认 - if (ja.size() == jo_mst.getInteger("dtl_num")) { - HashMap mapdtl = new HashMap<>(); + // 更新主表: 明细全部为正常 -1 主表为正常 + JSONArray jsonDtlArr = wo_dtl.query("check_id = '" + check_id + "' and check_result = '2'").getResultJSONArray(0); - mapdtl.put("status", "99"); - wo_dtl.update(mapdtl, "check_id='" + form.getString("check_id") + "'"); - - jo_mst.put("status", "99"); - jo_mst.put("confirm_optid", currentUserId); - jo_mst.put("confirm_optname", nickName); - jo_mst.put("confirm_time", now); + if (jsonDtlArr.size() == 0) { + // 更新主表为正常 + jsonMst.put("is_nok", "0"); + jsonMst.put("status", "99"); + } else { + jsonMst.put("is_nok", "1"); + jsonMst.put("status", "3"); } - wo_mst.update(jo_mst); + jsonMst.put("confirm_optid", currentUserId); + jsonMst.put("confirm_optname", nickName); + jsonMst.put("confirm_time", now); + wo_mst.update(jsonMst); } @Override @@ -683,5 +713,49 @@ public class CheckServiceImpl implements CheckService { //FileUtil.downloadExcel(list, response); } + @Override + @Transactional(rollbackFor = Exception.class) + public void disposeConfirm(JSONObject whereJson) { + WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_CheckMst"); + WQLObject dtlTab = WQLObject.getWQLObject("ST_IVT_CheckDtl"); + + JSONArray rows = whereJson.getJSONArray("rows"); + String currentUserId = SecurityUtils.getCurrentUserId(); + + String check_id = ""; + // 更新明细 + for (int i = 0; i < rows.size(); i++) { + JSONObject json = rows.getJSONObject(i); + String is_process = json.getString("is_process"); + check_id = json.getString("check_id"); + + if (StrUtil.equals(is_process, "1")) { + continue; + } + + JSONObject jsonDtl = dtlTab.query("checkdtl_id = '" + json.getString("checkdtl_id") + "'").uniqueResult(0); + + jsonDtl.put("is_process", "1"); + jsonDtl.put("status", "5"); + jsonDtl.put("process_optid", currentUserId); + jsonDtl.put("process_time", DateUtil.now()); + dtlTab.update(jsonDtl); + } + + // 如果异常是否处理都为是则更新全部明细状态为完成，更新主表为完成 + JSONArray jsonDtlArr = dtlTab.query("check_id = '" + check_id + "' and is_process = '0'").getResultJSONArray(0); + + if (ObjectUtil.isEmpty(jsonDtlArr)) { + JSONObject map = new JSONObject(); + map.put("status", "99"); + + // 更新明细为完成 + dtlTab.update(map,"check_id = '"+check_id+"'"); + + // 更新主表为完成 + mstTab.update(map,"check_id = '"+check_id+"'"); + } + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql index 3379dffcb..55b0f1299 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql @@ -27,6 +27,7 @@ 输入.material_id TYPEAS s_string 输入.quality_scode TYPEAS s_string 输入.pcsn TYPEAS s_string + 输入.sap_pcsn TYPEAS s_string 输入.ivt_level TYPEAS s_string 输入.is_active TYPEAS s_string 输入.sect_id TYPEAS s_string @@ -38,6 +39,7 @@ 输入.struct_code TYPEAS s_string 输入.ids TYPEAS f_string 输入.storagevehicle_code TYPEAS s_string + 输入.box_no TYPEAS s_string 输入.deptIds TYPEAS f_string 输入.in_stor_id TYPEAS f_string [临时表] @@ -173,6 +175,10 @@ struct.struct_code like 输入.struct_code ENDOPTION + OPTION 输入.box_no <> "" + struct.storagevehicle_code like 输入.box_no + ENDOPTION + OPTION 输入.stor_id <> "" struct.stor_id = 输入.stor_id ENDOPTION @@ -349,6 +355,7 @@ CheckDtl.process_type, CheckDtl.process_optid, CheckDtl.process_time, + CheckDtl.remark, struct.struct_code, struct.sect_code, mb.material_code, @@ -374,3 +381,55 @@ ENDSELECT ENDQUERY ENDIF + + IF 输入.flag = "9" + PAGEQUERY + SELECT + sub.* + FROM + st_ivt_structivt ivt + LEFT JOIN st_ivt_structattr attr ON ivt.struct_id = attr.struct_id + LEFT JOIN pdm_bi_subpackagerelation sub ON ivt.pcsn = sub.container_name AND sub.package_box_sn = attr.storagevehicle_code + WHERE + 1=1 + + OPTION 输入.box_no <> "" + sub.package_box_sn = 输入.box_no + ENDOPTION + + OPTION 输入.pcsn <> "" + ivt.pcsn like 输入.pcsn + ENDOPTION + + OPTION 输入.sap_pcsn <> "" + sub.sap_pcsn like 输入.sap_pcsn + ENDOPTION + + ENDSELECT + ENDPAGEQUERY + ENDIF + + IF 输入.flag = "10" + PAGEQUERY + SELECT + dtl.*, + mater.material_code, + mater.material_name + FROM + ST_IVT_CheckDtl dtl + LEFT JOIN md_me_materialbase mater ON dtl.material_id = mater.material_id + WHERE + dtl.check_result = '2' + and dtl.status in ('4','5') + + OPTION 输入.box_no <> "" + dtl.storagevehicle_code like 输入.box_no + ENDOPTION + + OPTION 输入.check_code <> "" + dtl.check_code = 输入.check_code + ENDOPTION + + ENDSELECT + ENDPAGEQUERY + ENDIF diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/check/AddDialog.vue b/lms/nladmin-ui/src/views/wms/st/inStor/check/AddDialog.vue index 2455c9846..8240715c7 100644 --- a/lms/nladmin-ui/src/views/wms/st/inStor/check/AddDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/inStor/check/AddDialog.vue @@ -115,14 +115,22 @@ > - - - - - - - - + + + + + + + + @@ -137,8 +146,8 @@ import CRUD, { crud, form } from '@crud/crud' import AddDtl from '@/views/wms/st/inStor/check/AddDtl' import check from '@/views/wms/st/inStor/check/check' -import crudStorattr from '@/views/wms/basedata/st/stor/storattr' import crudUserStor from '@/views/wms/basedata/st/userStor/userStor' +import DtlViewDialog from '@/views/wms/st/inStor/check/DtlViewDialog' const defaultForm = { check_code: '', @@ -154,7 +163,7 @@ const defaultForm = { } export default { name: 'AddDialog', - components: { AddDtl }, + components: { AddDtl, DtlViewDialog }, mixins: [crud(), form(defaultForm)], props: { dialogShow: { @@ -165,6 +174,8 @@ export default { dicts: ['check_bill_status', 'ST_INV_TYPE_CK', 'check_dtl_status'], data() { return { + paramDtlView: '', + dtlViewShow: false, dialogVisible: false, dtlShow: false, flagnow: false, @@ -281,6 +292,10 @@ export default { this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO) return false } + }, + openDtlView(row) { + this.paramDtlView = row.storagevehicle_code + this.dtlViewShow = true } } } diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/check/AddDtl.vue b/lms/nladmin-ui/src/views/wms/st/inStor/check/AddDtl.vue index c5c57f77c..315b61873 100644 --- a/lms/nladmin-ui/src/views/wms/st/inStor/check/AddDtl.vue +++ b/lms/nladmin-ui/src/views/wms/st/inStor/check/AddDtl.vue @@ -9,18 +9,24 @@ @close="close" @open="open" > - - - + + - - + + - - + + + + + - - - - - - + + +
- - @@ -80,7 +92,6 @@ import CRUD, { header, presenter } from '@crud/crud' import rrOperation from '@crud/RR.operation' import pagination from '@crud/Pagination' -import crudSectattr from '@/views/wms/basedata/st/sect/sectattr' import crudUserStor from '@/views/wms/basedata/st/userStor/userStor' export default { diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/check/CheckDialog.vue b/lms/nladmin-ui/src/views/wms/st/inStor/check/CheckDialog.vue index 33d248f92..2e5855b06 100644 --- a/lms/nladmin-ui/src/views/wms/st/inStor/check/CheckDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/inStor/check/CheckDialog.vue @@ -91,62 +91,75 @@ ref="table" :data="tableData" style="width: 100%;" - max-height="300" + max-height="400" border :highlight-current-row="true" :header-cell-style="{background:'#f5f7fa',color:'#606266'}" @current-change="handleCurrentChange" > - - - - - + + diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/check/ProcessDialog.vue b/lms/nladmin-ui/src/views/wms/st/inStor/check/ProcessDialog.vue index 63303addc..1685043f1 100644 --- a/lms/nladmin-ui/src/views/wms/st/inStor/check/ProcessDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/inStor/check/ProcessDialog.vue @@ -1,249 +1,148 @@ - diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/check/check.js b/lms/nladmin-ui/src/views/wms/st/inStor/check/check.js index 57ee12672..22acb1211 100644 --- a/lms/nladmin-ui/src/views/wms/st/inStor/check/check.js +++ b/lms/nladmin-ui/src/views/wms/st/inStor/check/check.js @@ -101,4 +101,11 @@ export function process1(data) { data }) } -export default { add, edit, del, getOutBillDtl, getStructIvt, getOutBillDtl2, confirm, getInvTypes, saveCheck, process0, getOutBillDis, process1 } +export function disposeConfirm(data) { + return request({ + url: '/api/check/disposeConfirm', + method: 'post', + data + }) +} +export default { add, edit, del, getOutBillDtl, getStructIvt, getOutBillDtl2, confirm, getInvTypes, saveCheck, process0, getOutBillDis, process1, disposeConfirm } diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/check/index.vue b/lms/nladmin-ui/src/views/wms/st/inStor/check/index.vue index ab347371c..279cd3446 100644 --- a/lms/nladmin-ui/src/views/wms/st/inStor/check/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/inStor/check/index.vue @@ -119,18 +119,18 @@ > 盘点 -
- + @@ -203,7 +203,6 @@ import pagination from '@crud/Pagination' import AddDialog from '@/views/wms/st/inStor/check/AddDialog' import CheckDialog from '@/views/wms/st/inStor/check/CheckDialog' import ProcessDialog from '@/views/wms/st/inStor/check/ProcessDialog' -import crudStorattr from '@/views/wms/basedata/st/stor/storattr' import { download } from '@/api/data' import { downloadFile } from '@/utils' import crudUserStor from '@/views/wms/basedata/st/userStor/userStor' @@ -232,6 +231,8 @@ export default { edit: ['admin', 'check:edit'], del: ['admin', 'check:del'] }, + processDialogShow: false, + openParam: '', check_flag: true, downdtl_flag: true, confirm_flag: true, @@ -341,6 +342,11 @@ export default { this.onSelectAll() this.crud.toQuery() this.handleCurrentChange(null) + }, + exceptionDispose() { + const _selectData = this.$refs.table.selection + this.openParam = _selectData[0].check_code + this.processDialogShow = true } } }