From 0fe2c3c01362d58feae1f87b1d813cb2007b416d Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Tue, 15 Nov 2022 21:30:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/HandNewMaterialServiceImpl.java | 2 +- .../st/out/rest/HandPFOutIvtController.java | 6 ++ .../st/out/service/HandPFOutIvtService.java | 7 ++ .../service/impl/HandPFOutIvtServiceImpl.java | 24 +++--- .../nl/pda/st/out/wql/QPADST_OUT_SERVICE.wql | 44 ++++++++--- .../service/impl/BagrecordServiceImpl.java | 11 ++- .../service/impl/BucketrecordServiceImpl.java | 29 ++++++- .../master/wql/QMD_PB_BAGRECORD01.wql | 2 +- .../master/wql/QMD_PB_BUCKETRECORD.wql | 74 +++++++++++++++++- .../impl/InspectionSchemeMstServiceImpl.java | 6 +- .../wms/pf/rest/AcceptFormulaController.java | 4 +- .../wms/pf/service/AcceptFormulaService.java | 4 +- .../impl/AcceptFormulaServiceImpl.java | 32 ++++++-- .../service/impl/AcceptMarkServiceImpl.java | 10 +++ .../nl/wms/pf/wql/QMD_PD_ACCEPTFORMULA01.wql | 4 + .../org/nl/wms/pf/wql/QMD_PD_ACCEPTMARK01.wql | 13 ++- .../src/main/java/org/nl/wms/ql/wql/ql.xls | Bin 251392 -> 251904 bytes mes/qd/src/api/wms/pf/acceptformula.js | 5 +- .../wms/basedata/master/bagrecord/index.vue | 49 ++++++------ .../basedata/master/bucketrecord/index.vue | 31 ++++++-- .../basedata/ql/inspectionSchemeMst/index.vue | 5 +- .../views/wms/pf/acceptformula/AddDialog.vue | 74 +++++++++--------- .../views/wms/pf/acceptformula/ViewDialog.vue | 45 ++++------- .../src/views/wms/pf/acceptmark/AddDialog.vue | 43 +++++++++- .../views/wms/pf/acceptmark/ViewDialog.vue | 36 ++++++++- mes/qd/src/views/wms/pf/acceptmark/index.vue | 14 +++- 26 files changed, 424 insertions(+), 150 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java index ff3a045c..87881316 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java @@ -696,7 +696,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService { if (StrUtil.isNotEmpty(bill_code)){ map.put("bill_code","%"+bill_code+"%"); } - JSONObject jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(ctx, "material_code desc"); + JSONObject jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(ctx, "mst.input_time desc,material_code desc"); JSONObject returnjo = new JSONObject(); returnjo.put("code", "1"); returnjo.put("desc", "查询成功！"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/rest/HandPFOutIvtController.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/rest/HandPFOutIvtController.java index feef4bcb..c089da7c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/rest/HandPFOutIvtController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/rest/HandPFOutIvtController.java @@ -49,5 +49,11 @@ public class HandPFOutIvtController { return new ResponseEntity<>(handPFOutIvtService.backStore(whereJson), HttpStatus.OK); } + @PostMapping("/queryStoragevehicle") + @Log("手持根据托盘查询单据") + @ApiOperation("手持根据托盘查询单据") + public ResponseEntity queryStoragevehicle(@RequestBody Map whereJson) { + return new ResponseEntity<>(handPFOutIvtService.queryStoragevehicle(whereJson), HttpStatus.OK); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/HandPFOutIvtService.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/HandPFOutIvtService.java index c2b638ea..72544868 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/HandPFOutIvtService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/HandPFOutIvtService.java @@ -10,6 +10,13 @@ public interface HandPFOutIvtService { * @return Map */ Map scanPoint(Map jsonObject); + + /** + * + * @param jsonObject + * @return + */ + Map queryStoragevehicle(Map jsonObject); /** * 出库确认 * diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java index 27d24646..ab4c3720 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java @@ -83,16 +83,22 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService { } //3、 通过托盘，查询【桶记录表】状态=入库，得到载具桶库存信息，无结果提示错误； JSONArray bucketrow = WQL.getWO("QPADST_OUT_SERVICE").addParam("flag", "2").addParam("storagevehicle_code", storagevehicle_code).process().getResultJSONArray(0); - /* if (ObjectUtil.isEmpty(bucketrow)) { - throw new PdaRequestException("桶记录表没有载具为【'" + storagevehicle_code + "'】的信息！"); + returnjo.put("code", "1"); + returnjo.put("desc", "查询成功"); + returnjo.put("result", bucketrow); + return returnjo; + } + + @Override + public Map queryStoragevehicle(Map jsonObject) { + JSONObject returnjo = new JSONObject(); + String storagevehicle_code = jsonObject.get("storagevehicle_code"); + + if (StrUtil.isEmpty(storagevehicle_code)) { + throw new PdaRequestException("载具不能为空!"); } - // 4、判断【仓位库存表】与【桶记录表】库存中的数量是否一致，不一致则提示错误 - String canuse_qty = ivtjo.getString("canuse_qty"); - String storage_qty = bucketrow.getString("storage_qty"); - BigDecimal flag = NumberUtil.sub(canuse_qty, storage_qty); - if (flag.doubleValue() != 0) { - throw new PdaRequestException("仓位库存中的可用数跟桶记录表中的数量不一致！"); - }*/ + //3、 通过托盘，查询【桶记录表】状态=入库，得到载具桶库存信息，无结果提示错误； + JSONArray bucketrow = WQL.getWO("QPADST_OUT_SERVICE").addParam("flag", "44").addParam("storagevehicle_code", storagevehicle_code).process().getResultJSONArray(0); returnjo.put("code", "1"); returnjo.put("desc", "查询成功"); returnjo.put("result", bucketrow); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/wql/QPADST_OUT_SERVICE.wql b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/wql/QPADST_OUT_SERVICE.wql index aae54db1..89ee8722 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/wql/QPADST_OUT_SERVICE.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/wql/QPADST_OUT_SERVICE.wql @@ -1,10 +1,10 @@ [交易说明] 交易名： 库区分页查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： + 所属模块： + 功能简述： + 版权所有： + 表引用： + 版本经历： [数据库] --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 @@ -28,26 +28,26 @@ [临时表] --这边列出来的临时表就会在运行期动态创建 - + [临时变量] --所有中间过程变量均可在此处定义 - + [业务过程] ########################################## # 1、输入输出检查 # ########################################## - + ########################################## # 2、主过程前处理 # ########################################## - - + + ########################################## # 3、业务主过程 # ########################################## - + IF 输入.flag = "1" QUERY SELECT @@ -184,6 +184,26 @@ ENDQUERY ENDIF + IF 输入.flag = "44" + QUERY + SELECT + bucket.bucketunique, + material.material_code, + material.material_name, + bucket.pcsn, + bucket.storage_qty + FROM + MD_PB_BucketRecord bucket + LEFT JOIN md_me_materialbase material ON material.material_id = bucket.material_id + where + 1=1 + OPTION 输入.storagevehicle_code <> "" + bucket.storagevehicle_code = 输入.storagevehicle_code + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF + IF 输入.flag = "5" QUERY SELECT @@ -248,4 +268,4 @@ ENDOPTION ENDSELECT ENDQUERY - ENDIF \ No newline at end of file + ENDIF diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/BagrecordServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/BagrecordServiceImpl.java index a467a126..397344c7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/BagrecordServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/BagrecordServiceImpl.java @@ -3,6 +3,7 @@ package org.nl.wms.basedata.master.service.impl; import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import lombok.RequiredArgsConstructor; import org.nl.exception.BadRequestException; @@ -51,8 +52,14 @@ public class BagrecordServiceImpl implements BagrecordService { HashMap map = new HashMap<>(); map.put("flag", "1"); - map.put("begin_time", MapUtil.getStr(whereJson,"begin_time")); - map.put("end_time", MapUtil.getStr(whereJson,"end_time")); + String begin_time = (String) whereJson.get("begin_time"); + String end_time = (String) whereJson.get("end_time"); + if (StrUtil.isNotEmpty(begin_time)) { + map.put("begin_time", begin_time.substring(0,10)+" 00:00:00"); + } + if (StrUtil.isNotEmpty(end_time)) { + map.put("end_time", end_time.substring(0,10)+" 23:59:59"); + } map.put("status", MapUtil.getStr(whereJson,"status")); map.put("waste_type", MapUtil.getStr(whereJson,"waste_type")); if (ObjectUtil.isNotEmpty(bag_id)) map.put("bag_id", "%"+bag_id+"%"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/BucketrecordServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/BucketrecordServiceImpl.java index c9a3467e..3b66705e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/BucketrecordServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/BucketrecordServiceImpl.java @@ -38,6 +38,7 @@ public class BucketrecordServiceImpl implements BucketrecordService { @Override public Map queryAll(Map whereJson, Pageable page) { + WQLObject sch_base_point = WQLObject.getWQLObject("sch_base_point"); String begin_time = (String) whereJson.get("begin_time"); String end_time = (String) whereJson.get("end_time"); String storagevehicle_type = (String) whereJson.get("storagevehicle_type"); @@ -51,8 +52,12 @@ public class BucketrecordServiceImpl implements BucketrecordService { String s = (String) whereJson.get(""); HashMap map = new HashMap<>(); map.put("flag", "1"); - map.put("begin_time", begin_time); - map.put("end_time", end_time); + if (StrUtil.isNotEmpty(begin_time)) { + map.put("begin_time", begin_time.substring(0,10)+" 00:00:00"); + } + if (StrUtil.isNotEmpty(end_time)) { + map.put("end_time", end_time.substring(0,10)+" 23:59:59"); + } map.put("storagevehicle_type", storagevehicle_type); if (!ObjectUtil.isEmpty(bucketunique)) { map.put("bucketunique", "%" + bucketunique + "%"); @@ -67,14 +72,32 @@ public class BucketrecordServiceImpl implements BucketrecordService { if (material_code.contains("\\")) material_code = material_code.replace("\\", "\\\\\\"); map.put("material_code", "%" + material_code + "%"); } - if (!ObjectUtil.isEmpty(point_code)) { + if (ObjectUtil.isNotEmpty(point_code)) { map.put("point_code", "%" + point_code + "%"); + map.put("flag", "1"); + }else{ + map.put("flag", "11"); } if (!ObjectUtil.isEmpty(pcsn)) { map.put("pcsn", "%" + pcsn + "%"); } map.put("status", status); JSONObject json = WQL.getWO("QMD_PB_BUCKETRECORD").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "br.bucketunique asc,br.storagevehicle_type asc"); + + if (ObjectUtil.isEmpty(point_code)) { + JSONArray ja = json.getJSONArray("content"); + for(int i=0;i '' WHERE 1=1 @@ -124,6 +124,76 @@ ENDPAGEQUERY ENDIF + IF 输入.flag = "11" + PAGEQUERY + SELECT + br.bucket_record_id, + br.bucketunique, + br.storagevehicle_type, + br.pcsn, + br.ivt_level, + br.is_active, + br.quality_scode, + br.qty_unit_name, + br.storage_qty, + br.record_order, + br.bag_qty, + br.remark, + br.status, + br.create_name, + br.create_time, + br.storagevehicle_code, + br.print_type, + + mater.material_code, + mater.material_name, + mater.ext_id + FROM + MD_PB_BucketRecord br + inner JOIN md_me_materialbase mater ON br.material_id = mater.material_id + inner JOIN md_pb_measureunit unit ON br.qty_unit_id = unit.measure_unit_id + WHERE + 1=1 + OPTION 输入.begin_time <> "" + br.create_time >= 输入.begin_time + ENDOPTION + + OPTION 输入.create_id <> "" + br.create_name like 输入.create_id + ENDOPTION + + OPTION 输入.pcsn <> "" + br.pcsn like 输入.pcsn + ENDOPTION + + OPTION 输入.end_time <> "" + br.create_time <= 输入.end_time + ENDOPTION + + OPTION 输入.storagevehicle_type <> "" + br.storagevehicle_type = 输入.storagevehicle_type + ENDOPTION + + OPTION 输入.storagevehicle_code <> "" + br.storagevehicle_code like 输入.storagevehicle_code + ENDOPTION + + OPTION 输入.bucketunique <> "" + br.bucketunique like 输入.bucketunique + ENDOPTION + + OPTION 输入.status <> "" + br.status = 输入.status + ENDOPTION + + OPTION 输入.material_code <> "" + (mater.material_code like 输入.material_code or + mater.material_name like 输入.material_code ) + ENDOPTION + ENDSELECT + ENDPAGEQUERY + ENDIF + IF 输入.flag = "2" QUERY SELECT diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/ql/service/impl/InspectionSchemeMstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/ql/service/impl/InspectionSchemeMstServiceImpl.java index ba59195d..b551eee9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/ql/service/impl/InspectionSchemeMstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/ql/service/impl/InspectionSchemeMstServiceImpl.java @@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.exception.BadRequestException; +import org.nl.modules.system.util.CodeUtil; import org.nl.utils.SecurityUtils; import org.nl.wms.basedata.ql.service.InspectionSchemeMstService; import org.nl.wms.basedata.ql.service.dto.InspectionSchemeMstDto; @@ -43,7 +44,7 @@ public class InspectionSchemeMstServiceImpl implements InspectionSchemeMstServic map.put("flag", "1"); map.put("inspection_scheme_type", whereJson.get("inspection_scheme_type")); map.put("name", whereJson.get("name")); - JSONObject json = WQL.getWO("QL_InspectionSchemeMst_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc"); + JSONObject json = WQL.getWO("QL_InspectionSchemeMst_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "inspection_scheme_code asc,update_time desc"); return json; } @@ -78,8 +79,11 @@ public class InspectionSchemeMstServiceImpl implements InspectionSchemeMstServic String nickName = SecurityUtils.getNickName(); String now = DateUtil.now(); + String Inspection_scheme_code = CodeUtil.getNewCode("F_CODE"); + dto.setInspection_scheme_id(IdUtil.getSnowflake(1, 1).nextId()); dto.setCreate_id(currentUserId); + dto.setInspection_scheme_code(Inspection_scheme_code); dto.setCreate_name(nickName); dto.setUpdate_optid(currentUserId); dto.setUpdate_optname(nickName); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/rest/AcceptFormulaController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/rest/AcceptFormulaController.java index 6c62803e..f306bc41 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/rest/AcceptFormulaController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/rest/AcceptFormulaController.java @@ -73,8 +73,8 @@ public class AcceptFormulaController { @Log("获取成型剂类别") @ApiOperation("获取成型剂类别") @GetMapping("/getBoms") - public ResponseEntity getBoms() { - return new ResponseEntity<>(acceptFormulaService.getBoms(),HttpStatus.OK); + public ResponseEntity getBoms(@RequestParam Map whereJson) { + return new ResponseEntity<>(acceptFormulaService.getBoms(whereJson),HttpStatus.OK); } @Log("获取成型剂类别") @ApiOperation("获取成型剂类别") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/AcceptFormulaService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/AcceptFormulaService.java index d7e07ccb..21e3ca87 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/AcceptFormulaService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/AcceptFormulaService.java @@ -74,7 +74,7 @@ public interface AcceptFormulaService { /** * 提交 */ - JSONArray getBoms(); + JSONArray getBoms(Map whereJson); /** * 提交 */ @@ -82,7 +82,7 @@ public interface AcceptFormulaService { /** * 提交 */ - JSONArray getPCSNs(Map whereJson); + JSONObject getPCSNs(Map whereJson); /** * 提交 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java index 563447cf..0c42e09e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java @@ -200,6 +200,11 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService { JSONObject FactoryWarrantyMst = QL_TEST_FactoryWarrantyMst.query("inspection_id='"+inspection_id+"'").uniqueResult(0); String material_pcsn = FactoryWarrantyMst.getString("pcsn"); + now.put("material_id", jsonMst.getString("material_id")); + now.put("mark_id", jsonMst.getString("mark_id")); + now.put("accept_pcsn", jsonMst.getString("accept_pcsn")); + now.put("accept_qty", jsonMst.getString("accept_qty")); + now.put("remark", jsonMst.getString("remark")); now.put("material_pcsn", material_pcsn); now.put("update_optid", currentUserId); now.put("update_optname", nickName); @@ -274,8 +279,8 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService { } @Override - public JSONArray getBoms() { - HashMap map = new HashMap<>(); + public JSONArray getBoms(Map whereJson) { + HashMap map = new HashMap<>(whereJson); map.put("flag", "3"); JSONArray ret = WQL.getWO("QMD_PD_ACCEPTFORMULA01").addParamMap(map).process().getResultJSONArray(0); return ret; @@ -290,11 +295,24 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService { } @Override - public JSONArray getPCSNs(Map whereJson) { + public JSONObject getPCSNs(Map whereJson) { + WQLObject mstTab = WQLObject.getWQLObject("QL_TEST_AcceptMark"); HashMap map = new HashMap<>(whereJson); map.put("flag", "5"); - JSONArray ret = WQL.getWO("QMD_PD_ACCEPTFORMULA01").addParamMap(map).process().getResultJSONArray(0); - return ret; + JSONArray ja = WQL.getWO("QMD_PD_ACCEPTFORMULA01").addParamMap(map).process().getResultJSONArray(0); + + map.put("flag", "3"); + JSONObject jo = WQL.getWO("QMD_PD_ACCEPTFORMULA01").addParamMap(map).process().uniqueResult(0); + JSONObject result = new JSONObject(); + result.put("ja",ja); + result.put("jo",jo); + if(jo == null){ + throw new BadRequestException("当前碳化钨无牌号可用！"); + }else{ + JSONObject jo2 = mstTab.query("is_delete = '0' and mark_id='"+jo.getString("id")+"'").uniqueResult(0); + result.put("jo2",jo2); + } + return result; } @Override @@ -412,7 +430,9 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService { // 厂家 JSONObject jsonFactMst = factMstTab.query("material_id = '" + jsonFormMst.getString("material_id") + "' and pcsn = '" + jsonFormMst.getString("material_pcsn") + "' and is_delete = '0'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonFactMst)) oneMap.put("manufactor", jsonFactMst.getString("manufactor")); + if (ObjectUtil.isNotEmpty(jsonFactMst)) { + oneMap.put("manufactor", jsonFactMst.getString("manufactor")); + } // 实验牌号 JSONObject jsonMark= markTab.query("mark_id = '" + jsonFormMst.getString("mark_id") + "' and is_delete = '0'").uniqueResult(0); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptMarkServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptMarkServiceImpl.java index 2fe9c1c0..7fddf619 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptMarkServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptMarkServiceImpl.java @@ -50,6 +50,14 @@ public class AcceptMarkServiceImpl implements AcceptMarkService { } map.put("material_code", "%"+material_code+"%"); } + String mark_code = (String) whereJson.get("mark_code"); + if (!StrUtil.isEmpty(mark_code)) { + //处理转义字符 + if (mark_code.contains("\\")) { + mark_code = mark_code.replace("\\", "\\\\\\"); + } + map.put("mark_code", "%"+mark_code+"%"); + } map.put("flag", "1"); JSONObject json = WQL.getWO("QMD_PD_ACCEPTMARK01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time desc"); return json; @@ -157,6 +165,8 @@ public class AcceptMarkServiceImpl implements AcceptMarkService { now.put("ball_speed", jsonMst.getString("ball_speed")); now.put("ball_time", jsonMst.getString("ball_time")); now.put("remark", jsonMst.getString("remark")); + now.put("accept_qty", jsonMst.getString("accept_qty")); + now.put("material_id", jsonMst.getString("material_id")); now.put("update_optid", currentUserId); now.put("update_optname", nickName); now.put("update_time", DateUtil.now()); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QMD_PD_ACCEPTFORMULA01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QMD_PD_ACCEPTFORMULA01.wql index 167f6d70..b5b3eae3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QMD_PD_ACCEPTFORMULA01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QMD_PD_ACCEPTFORMULA01.wql @@ -104,12 +104,16 @@ SELECT AcceptMark.mark_id AS id , AcceptMark.mark_code AS code , + AcceptMark.accept_qty AS accept_qty , AcceptMark.mark_code AS name FROM QL_TEST_AcceptMark AcceptMark WHERE 1 = 1 AND AcceptMark.is_delete = '0' + OPTION 输入.material_id <> "" + AcceptMark.material_id = 输入.material_id + ENDOPTION ENDSELECT ENDQUERY ENDIF diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QMD_PD_ACCEPTMARK01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QMD_PD_ACCEPTMARK01.wql index 43ae634e..68eeb66e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QMD_PD_ACCEPTMARK01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QMD_PD_ACCEPTMARK01.wql @@ -15,6 +15,7 @@ ################################################# 输入.flag TYPEAS s_string 输入.material_code TYPEAS s_string + 输入.mark_code TYPEAS s_string 输入.old_mark TYPEAS s_string 输入.is_used TYPEAS s_string 输入.mark_id TYPEAS s_string @@ -45,14 +46,20 @@ IF 输入.flag = "1" PAGEQUERY SELECT - AcceptMark.* + AcceptMark.*, + mater.material_code, + mater.material_name FROM QL_TEST_AcceptMark AcceptMark + LEFT JOIN MD_ME_MaterialBase mater ON AcceptMark.material_id = mater.material_id WHERE AcceptMark.is_delete = '0' - OPTION 输入.material_code <> "" - AcceptMark.mark_code like 输入.material_code + OPTION 输入.mark_code <> "" + AcceptMark.mark_code like 输入.mark_code ENDOPTION + OPTION 输入.material_code <> "" + (mater.material_code like 输入.material_code or mater.material_name like 输入.material_code) + ENDOPTION ENDSELECT ENDPAGEQUERY ENDIF diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/ql.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/ql.xls index 5687bf58f5556dd2d79d5c077b77fd12274faffa..5ed4b81275508a0d42bd6fa80cd79b1b4603c2e0 100644 GIT binary patch delta 7426 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 diff --git a/mes/qd/src/api/wms/pf/acceptformula.js b/mes/qd/src/api/wms/pf/acceptformula.js index 96775477..caee91a4 100644 --- a/mes/qd/src/api/wms/pf/acceptformula.js +++ b/mes/qd/src/api/wms/pf/acceptformula.js @@ -45,10 +45,11 @@ export function getDtl(params) { params }) } -export function getBoms() { +export function getBoms(params) { return request({ url: 'api/acceptformula/getBoms', - method: 'get' + method: 'get', + params }) } export function getTHWs() { diff --git a/mes/qd/src/views/wms/basedata/master/bagrecord/index.vue b/mes/qd/src/views/wms/basedata/master/bagrecord/index.vue index dbde5615..420146e8 100644 --- a/mes/qd/src/views/wms/basedata/master/bagrecord/index.vue +++ b/mes/qd/src/views/wms/basedata/master/bagrecord/index.vue @@ -11,34 +11,17 @@ label-width="80px" label-suffix=":" > - @@ -214,6 +197,7 @@ import { download } from '@/api/data' import { downloadFile } from '@/utils' import { getLodop } from '@/assets/js/lodop/LodopFuncs' import crudBucketrecord from "@/api/wms/basedata/master/bucketrecord"; +import Date from '@/utils/datetime' const defaultForm = { bagrecord_id: null, bag_id: null, material_id: null, pcsn: null, qty_unit_id: null, qty_unit_name: null, storage_qty: null, seqno: null, remark: null, waste_type: null, return_person: null, print_times: null, status: null, input_optid: null, input_optname: null, input_time: null, bucketunique: null, makeup_optid: null, makeup_optname: null, makeup_time: null, print_type: null } export default { @@ -248,20 +232,22 @@ export default { { 'code': '02', 'name': '组桶' }, { 'code': '03', 'name': '清洗' } ], - open: true, + query_flag: true, permission: { }, rules: { }} }, + created() { + this.crud.query.createTime = [new Date().daysAgo(7), new Date()] + }, methods: { // 钩子：在获取表格数据之前执行，false 则代表不获取数据 [CRUD.HOOK.beforeRefresh]() { - if (this.open) { - this.open = false - return false - } else { - return true + if (this.query_flag) { + this.crud.query.begin_time = (new Date().daysAgo(7)).strftime('%F', 'zh') + this.crud.query.end_time = (new Date()).strftime('%F', 'zh') + this.query_flag = false } }, hand(value) { @@ -288,6 +274,19 @@ export default { }) } }, + onInput() { + this.$forceUpdate() + }, + mytoQuery(array1){ + if(array1 === null){ + this.crud.query.begin_time = '' + this.crud.query.end_time = '' + }else{ + this.crud.query.begin_time = array1[0] + this.crud.query.end_time = array1[1] + } + this.crud.toQuery() + }, print: function() { const _selectData = this.$refs.table.selection for (let i = 0; i < _selectData.length; i++) { diff --git a/mes/qd/src/views/wms/basedata/master/bucketrecord/index.vue b/mes/qd/src/views/wms/basedata/master/bucketrecord/index.vue index 50ef357e..11af2f0d 100644 --- a/mes/qd/src/views/wms/basedata/master/bucketrecord/index.vue +++ b/mes/qd/src/views/wms/basedata/master/bucketrecord/index.vue @@ -48,11 +48,12 @@ @@ -160,7 +161,7 @@ - +