From bbd44cbc31c44c9fabf5001963dba3f6e4ae3b47 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Tue, 18 Oct 2022 11:08:00 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 e8bb7440..98413e7e 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 @@ -161,6 +161,10 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService { jsonDtl.put("formula_code", formula_code+""); jsonDtl.put("seq_no", (i+1)+""); jsonDtl.put("material_type","01"); + String material_id = json.getString("material_id"); + if("1503644362234531840,1503644362788179968".contains(material_id)){ + jsonDtl.put("material_type","02"); + } jsonDtl.put("material_id", json.getString("material_id")); jsonDtl.put("dtl_pcsn", json.getString("dtl_pcsn")); jsonDtl.put("formula_qty", json.getString("formula_qty")); @@ -215,6 +219,10 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService { jsonDtl.put("formula_code", now.getString("formula_code")); jsonDtl.put("seq_no", (i+1)+""); jsonDtl.put("material_type","01"); + String material_id = json.getString("material_id"); + if("1503644362234531840,1503644362788179968".contains(material_id)){ + jsonDtl.put("material_type","02"); + } jsonDtl.put("material_id", json.getString("material_id")); jsonDtl.put("dtl_pcsn", json.getString("dtl_pcsn")); jsonDtl.put("formula_qty", json.getString("formula_qty")); From 18acc68656bfee39d9faf811be34cf0e2a8c776d Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Tue, 18 Oct 2022 11:40:34 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/pcs/rest/ReceivemstController.java | 9 ++ .../nl/wms/pcs/service/ReceivemstService.java | 7 ++ .../service/impl/ReceivemstServiceImpl.java | 91 ++++++++++++++++++- .../nl/wms/pcs/wql/QPCS_RC_RECEIVEMST01.wql | 76 ++++++++++++++++ mes/qd/src/views/wms/pcs/receivemst/index.vue | 35 +++++-- 5 files changed, 208 insertions(+), 10 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/rest/ReceivemstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/rest/ReceivemstController.java index ceec8b71..44764dad 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/rest/ReceivemstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/rest/ReceivemstController.java @@ -17,9 +17,13 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.*; + +import java.io.IOException; import java.util.Map; import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletResponse; + /** * @author Liuxy * @date 2021-12-15 @@ -133,4 +137,9 @@ public class ReceivemstController { receivemstService.createQc(whereJson); return new ResponseEntity<>(HttpStatus.OK); } + @ApiOperation("导出数据") + @GetMapping(value = "/download") + public void download(HttpServletResponse response, ReceivemstQueryDto dto) throws IOException { + receivemstService.download(dto, response); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/ReceivemstService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/ReceivemstService.java index 632e378e..f13c6240 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/ReceivemstService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/ReceivemstService.java @@ -101,4 +101,11 @@ public interface ReceivemstService { * @param whereJson/ */ void createQc(Map whereJson); + /** + * + * @param whereJson + * @param response + * @throws IOException + */ + void download(ReceivemstQueryDto dto, HttpServletResponse response) throws IOException; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ReceivemstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ReceivemstServiceImpl.java index 7fa72abf..bf779bb4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ReceivemstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ReceivemstServiceImpl.java @@ -2,6 +2,7 @@ package org.nl.wms.pcs.service.impl; +import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; @@ -16,6 +17,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.exception.BadRequestException; import org.nl.modules.security.service.dto.JwtUserDto; import org.nl.modules.system.util.CodeUtil; +import org.nl.utils.FileUtil; import org.nl.utils.SecurityUtils; import org.nl.wms.basedata.master.constant.MaterOptTypeEnum; import org.nl.wms.basedata.master.service.ClassstandardService; @@ -34,9 +36,9 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.*; /** * @author Liuxy @@ -539,4 +541,87 @@ public class ReceivemstServiceImpl implements ReceivemstService { } + @Override + public void download(ReceivemstQueryDto dto, HttpServletResponse response) throws IOException { + + //根据登陆人员的所在部门查找对应的计划 + String user_id = String.valueOf(SecurityUtils.getCurrentUserId()); + JSONObject jsonUser = WQLObject.getWQLObject("sys_user").query("user_id = '" + user_id + "'").uniqueResult(0); + + String begin_time = dto.getBegin_time(); + String end_time = dto.getEnd_time(); + String vbillcode = dto.getVbillcode(); + String receive_code = dto.getReceive_code(); + String material_code = dto.getMaterial_code(); + String supp_code = dto.getSupp_code(); + String pcsn = dto.getPcsn(); + String[] statusArr = dto.getStatus(); + String status = "('"; + if (ObjectUtil.isNotEmpty(statusArr)) { + for (int i = 0; i < statusArr.length; i++) { + + if ((i+1) == statusArr.length) { + status = status +statusArr[i] + "')"; + } else { + status = status + statusArr[i] + "','"; + } + } + } + HashMap map = new HashMap<>(); + map.put("flag", "11"); + map.put("begin_time", begin_time); + map.put("end_time", end_time); + map.put("vbillcode", vbillcode); + map.put("receive_code", receive_code); + map.put("supp_code", supp_code); + if (ObjectUtil.isNotEmpty(statusArr)) { + map.put("status", status); + } + if (ObjectUtil.isNotEmpty(pcsn)) { + map.put("pcsn", "%"+pcsn+"%"); + } + if (ObjectUtil.isNotEmpty(material_code)) { + map.put("material_code", "%"+material_code+"%"); + } + JSONArray rows = WQL.getWO("QPCS_RC_RECEIVEMST01").addParamMap(map).process().getResultJSONArray(0); + + List> list = new ArrayList<>(); + for (int i = 0; i < rows.size(); i++) { + JSONObject jo = rows.getJSONObject(i); + Map dtl_map = new LinkedHashMap<>(); + String status2 = jo.getString("status"); + if(status2.equals("10")){ + dtl_map.put("状态", "生成"); + }else if(status2.equals("20")){ + dtl_map.put("状态", "提交"); + }else if(status2.equals("30")){ + dtl_map.put("状态", "到货中"); + }else if(status2.equals("99")){ + dtl_map.put("状态", "确认"); + } + dtl_map.put("订单编号", jo.getString("vbillcode")); + dtl_map.put("到货单号", jo.getString("receive_code")); + dtl_map.put("供应商", jo.getString("supp_name")); + dtl_map.put("物料编码", jo.getString("material_code")); + dtl_map.put("物料名称", jo.getString("material_name")); + dtl_map.put("批次号", jo.getString("pcsn")); + + String is_no = jo.getString("is_no"); + if (StrUtil.isEmpty(is_no)) { + dtl_map.put("质检单是否已生成", "否"); + }else{ + dtl_map.put("质检单是否已生成", "是"); + } + + dtl_map.put("到货重量", jo.getString("receive_qty")); + dtl_map.put("入库重量", jo.getString("instor_qty")); + dtl_map.put("剩余重量", jo.getString("surplus_qty")); + dtl_map.put("单位", jo.getString("qty_unit_name")); + dtl_map.put("创建人", jo.getString("input_optname")); + dtl_map.put("到货日期", jo.getString("receive_date")); + list.add(dtl_map); + } + FileUtil.downloadExcel(list, response); + } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_RC_RECEIVEMST01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_RC_RECEIVEMST01.wql index fe65d9ea..0d45b65e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_RC_RECEIVEMST01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_RC_RECEIVEMST01.wql @@ -124,6 +124,82 @@ ENDPAGEQUERY ENDIF + IF 输入.flag = "11" + QUERY + SELECT + dtl.*, + supp.supp_name, + mater.material_code, + mater.material_name, + mst.receive_date, + mst.input_optname, + mst.source_type, + mst.create_mode, + mst.receive_type, + mst.stor_id, + mst.stor_name, + mst.remark, + mst.dtl_num, + mst.total_qty, + proc.vbillcode, + ext.standard_weight, + (dtl.receive_qty - dtl.instor_qty) AS surplus_qty, + SUBSTR(proc.vbillcode,1,6) AS order_code_1, + SUBSTR(proc.vbillcode,8,10) AS order_code_2, + sheetMst.inspection_id AS is_no + FROM + PCS_RC_ReceiveDtl dtl + LEFT JOIN pcs_rc_receivemst mst ON mst.receive_id = dtl.receive_id + LEFT JOIN MD_ME_MaterialBase mater ON mater.material_id = dtl.material_id + LEFT JOIN PCS_IF_PurchaseOrderProc proc ON proc.id = dtl.source_billdtl_id + LEFT JOIN MD_CS_SUPPLIERBASE supp ON proc.vend_id = supp.ext_id + LEFT JOIN MD_ME_StockMaterialExt ext ON mater.material_id = ext.material_id + LEFT JOIN QL_TEST_InspectionSheetDtl sheetDtl ON dtl.material_id = sheetDtl.material_id AND dtl.pcsn = sheetDtl.pcsn + LEFT JOIN QL_TEST_InspectionSheetMst sheetMst ON sheetMst.inspection_id = sheetDtl.inspection_id and sheetMst.is_delete = '0' + WHERE + mst.is_delete = '0' + + OPTION 输入.dept_id <> "" + mst.sysdeptid = 输入.dept_id + ENDOPTION + + OPTION 输入.begin_time <> "" + mst.receive_date >= 输入.begin_time + ENDOPTION + + OPTION 输入.end_time <> "" + mst.receive_date <= 输入.end_time + ENDOPTION + + OPTION 输入.vbillcode <> "" + proc.vbillcode = 输入.vbillcode + ENDOPTION + + OPTION 输入.receive_code <> "" + dtl.receive_code = 输入.receive_code + ENDOPTION + + OPTION 输入.material_code <> "" + ( mater.material_code like "%" 输入.material_code "%" or + mater.material_name like "%" 输入.material_code "%") + ENDOPTION + + OPTION 输入.pcsn <> "" + dtl.pcsn like 输入.pcsn + ENDOPTION + + OPTION 输入.supp_code <> "" + ( supp.supp_code like "%" 输入.supp_code "%" or + supp.supp_name like "%" 输入.supp_code "%") + ENDOPTION + + OPTION 输入.status <> "" + dtl.status in 输入.status + ENDOPTION + order by order_code_1 DESC,order_code_2 ASC,mst.receive_code ASC + ENDSELECT + ENDQUERY + ENDIF IF 输入.flag = "2" PAGEQUERY diff --git a/mes/qd/src/views/wms/pcs/receivemst/index.vue b/mes/qd/src/views/wms/pcs/receivemst/index.vue index 46abc2c0..0d9b5925 100644 --- a/mes/qd/src/views/wms/pcs/receivemst/index.vue +++ b/mes/qd/src/views/wms/pcs/receivemst/index.vue @@ -134,6 +134,16 @@ > 打印 + + 导出excel + - - + + - - - - - + + + + + @@ -228,6 +238,8 @@ import pagination from '@crud/Pagination' import DateRangePicker from '@/components/DateRangePicker' import AddShowDialog from '@/views/wms/pcs/receivemst/AddShowDialog' import { getLodop } from '@/assets/js/lodop/LodopFuncs' +import { download } from '@/api/data' +import { downloadFile } from '@/utils' export default { name: 'Receivemst', @@ -331,6 +343,15 @@ export default { this.printDialog = true this.acuTotal() }, + downdtl() { + crud.downloadLoading = true + download('/api/receivemst/download', this.crud.query).then(result => { + downloadFile(result, '到货通知单', 'xlsx') + crud.downloadLoading = false + }).catch(() => { + crud.downloadLoading = false + }) + }, print() { if (this.form.print_qty <= 0) { this.crud.notify('数量不能为0!', CRUD.NOTIFICATION_TYPE.INFO) From ae2ed0f2b2118d9cbb5df2c5083b9c7b76dcb90b Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Tue, 18 Oct 2022 14:34:45 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/basedata/em/service/impl/DevicebomServiceImpl.java | 2 +- .../basedata/em/service/impl/DevicefaultclassServiceImpl.java | 2 +- .../em/service/impl/DevicemaintenanceitemsServiceImpl.java | 2 +- .../basedata/em/service/impl/DevicerepairitemsServiceImpl.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicebomServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicebomServiceImpl.java index 31a8cc2b..31c0b580 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicebomServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicebomServiceImpl.java @@ -64,7 +64,7 @@ public class DevicebomServiceImpl implements DevicebomService { map.put("classIds", classIds); } - JSONObject json = WQL.getWO("QEM_BI_DEVICEBOM01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.update_time DESC"); + JSONObject json = WQL.getWO("QEM_BI_DEVICEBOM01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.create_time DESC"); return json; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicefaultclassServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicefaultclassServiceImpl.java index 278273e9..a039cef4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicefaultclassServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicefaultclassServiceImpl.java @@ -61,7 +61,7 @@ public class DevicefaultclassServiceImpl implements DevicefaultclassService { String classIds = classstandardService.getAllChildIdStr(class_idStr); map.put("classIds", classIds); } - JSONObject json = WQL.getWO("QEM_BI_DEVICEFAULTCLASS001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.update_time DESC"); + JSONObject json = WQL.getWO("QEM_BI_DEVICEFAULTCLASS001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.create_time DESC"); return json; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicemaintenanceitemsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicemaintenanceitemsServiceImpl.java index 59598892..e5be0e0d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicemaintenanceitemsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicemaintenanceitemsServiceImpl.java @@ -70,7 +70,7 @@ public class DevicemaintenanceitemsServiceImpl implements Devicemaintenanceitems String classIds = classstandardService.getAllChildIdStr(class_idStr); map.put("classIds", ""); } - JSONObject json = WQL.getWO("QEM_BI_DEVICEMAINTAIN001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time DESC"); + JSONObject json = WQL.getWO("QEM_BI_DEVICEMAINTAIN001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time DESC"); return json; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicerepairitemsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicerepairitemsServiceImpl.java index 3626e1ae..b30e9c09 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicerepairitemsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicerepairitemsServiceImpl.java @@ -65,7 +65,7 @@ public class DevicerepairitemsServiceImpl implements DevicerepairitemsService { map.put("classIds", ""); } - JSONObject json = WQL.getWO("QEM_BI_DEVICEREPAIRITEMS01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time DESC"); + JSONObject json = WQL.getWO("QEM_BI_DEVICEREPAIRITEMS01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time DESC"); return json; } From 1a9dd2bcb1a667746588c592edaccc7d9d951cd2 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Tue, 18 Oct 2022 15:24:04 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pdm/service/impl/DailyplanServiceImpl.java | 4 ++-- .../pdm/service/impl/WorkOrderServiceImpl.java | 15 +++++---------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java index b7fd0270..3bed4152 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java @@ -405,8 +405,8 @@ public class DailyplanServiceImpl implements DailyplanService { new_jo.put("workorder_qty",jo.getString("standard_weight")); new_jo.put("planstart_time",jo.getString("planstart_date").substring(0,10)+" 08:00:00"); new_jo.put("planend_time",jo.getString("planend_date").substring(0,10)+" 23:59:59"); - new_jo.put("status",jsonMst.getString("remark")); - new_jo.put("remark","10"); + new_jo.put("remark",jsonMst.getString("remark")); + new_jo.put("status","10"); new_jo.put("create_mode","03"); new_jo.put("source_bill_id",jo.getString("dailyplan_id")); new_jo.put("source_bill_type",jo.getString("workorder_type")); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java index 9d2fa9c0..c799fd42 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java @@ -201,17 +201,12 @@ public class WorkOrderServiceImpl implements WorkOrdereService { continue; } JSONObject param = new JSONObject(); - param.put("workorder_id", String.valueOf(workorder_id)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", now); - PDM_BI_WorkOrder.update(param); + String workorder_id2 = String.valueOf(workorder_id); + PDM_BI_WorkOrder.delete("workorder_id='"+workorder_id2+"'"); String source_bill_id = jo.getString("source_bill_id"); - - JSONArray ja = PDM_BI_WorkOrder.query("is_delete='0' and source_bill_id='"+source_bill_id+"'").getResultJSONArray(0); - if(ja.size() == 0){ - if (StrUtil.isNotEmpty(source_bill_id)) { + if (StrUtil.isNotEmpty(source_bill_id)) { + JSONArray ja = PDM_BI_WorkOrder.query("is_delete='0' and source_bill_id='"+source_bill_id+"'").getResultJSONArray(0); + if(ja.size() == 0){ JSONObject param2 = new JSONObject(); param2.put("status", "01"); MPS_BD_ProductDailyPlan.update(param2,"dailyplan_id='"+source_bill_id+"'"); From e82af8005c7ba5d20970a606c4a6a42e58608f85 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 18 Oct 2022 15:45:57 +0800 Subject: [PATCH 5/6] =?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 --- .../impl/DevicerepairrequestServiceImpl.java | 21 ++++++++++++++++ .../wql/EM_BI_DEVICEREPAIRREQUEST001.wql | 25 ++++++++++++++++++- 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairrequestServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairrequestServiceImpl.java index 46791dd0..03581e4c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairrequestServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairrequestServiceImpl.java @@ -2,6 +2,7 @@ package org.nl.wms.sb.repair.service.impl; +import cn.hutool.core.date.DateTime; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; @@ -153,10 +154,30 @@ public class DevicerepairrequestServiceImpl implements DevicerepairrequestServic public void create(DevicerepairrequestDto dto) { DeptService deptService = SpringContextHolder.getBean(DeptService.class); + WQLObject fileTab = WQLObject.getWQLObject("EM_BI_EquipmentFile"); + Long currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getNickName(); String now = DateUtil.now(); + // 前一天运行记录表 超过三条没填的报错 + JSONArray numRunArr = new JSONArray(); + String yesterday = DateUtil.yesterday().toString().substring(0,10); + JSONArray fileArr = fileTab.query("is_delete = '0' and status not in ('90','91')").getResultJSONArray(0); + + JSONObject map = new JSONObject(); + map.put("flag", "5"); + map.put("yesterday",yesterday); + for (int i = 0; i < fileArr.size(); i++) { + JSONObject json = fileArr.getJSONObject(i); + map.put("devicerecord_id",json.getString("devicerecord_id")); + + JSONObject jsonRun = WQL.getWO("EM_BI_DEVICEREPAIRREQUEST001").addParamMap(map).process().uniqueResult(0); + if (ObjectUtil.isEmpty(jsonRun)) numRunArr.add(jsonRun); + } + + if (numRunArr.size() > 3) throw new BadRequestException("昨天设备运行记录有超过3条未填写,未填写:"+String.valueOf(numRunArr.size()) + "条"); + JwtUserDto currentUser = (JwtUserDto) SecurityUtils.getCurrentUser(); Long deptId = currentUser.getDeptId(); // 登录人所在班组下的设备维修单（结束维修） > 2 报错 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRREQUEST001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRREQUEST001.wql index 48e7200e..67c89f4f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRREQUEST001.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRREQUEST001.wql @@ -21,7 +21,9 @@ 输入.begin_time TYPEAS s_string 输入.end_time TYPEAS s_string 输入.deptIds TYPEAS f_string - 输入.use_groupid TYPEAS f_string + 输入.use_groupid TYPEAS f_string + 输入.yesterday TYPEAS s_string + 输入.devicerecord_id TYPEAS s_string [临时表] @@ -187,5 +189,26 @@ ENDQUERY ENDIF + IF 输入.flag = "5" + QUERY + SELECT + * + FROM + EM_BI_DeviceRunRecord + WHERE + 1=1 + + OPTION 输入.yesterday <> "" + run_date = 输入.yesterday + ENDOPTION + + OPTION 输入.devicerecord_id <> "" + devicerecord_id = 输入.devicerecord_id + ENDOPTION + + ENDSELECT + ENDQUERY + ENDIF + From 536078f78e192d0a565e25bbe860f5b23cd89818 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 18 Oct 2022 18:38:47 +0800 Subject: [PATCH 6/6] =?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/pf/service/impl/AcceptFormulaServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 98413e7e..a6817593 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 @@ -421,18 +421,18 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService { // 酒精体积：液料比*开单总重 double bar_bulk = NumberUtil.mul(jsonFormMst.getDoubleValue("confirm_qty"), jsonMark.getDoubleValue("liquid_rate")); - oneMap.put("bar_bulk", NumberUtil.round(bar_bulk, 3).toString()); + oneMap.put("bar_bulk", NumberUtil.round(bar_bulk, 0).toString()); // 合金球重量：球料比*开单总重 double ball_rate_2 = NumberUtil.mul(jsonFormMst.getDoubleValue("confirm_qty"), jsonMark.getDoubleValue("ball_rate")); double ball_weight = NumberUtil.div(ball_rate_2, 1000); - oneMap.put("ball_weight", NumberUtil.round(ball_weight, 3).toString()); + oneMap.put("ball_weight", NumberUtil.round(ball_weight, 0).toString()); // 球磨时间 - oneMap.put("ball_time", jsonMark.getString("ball_time")); + oneMap.put("ball_time",NumberUtil.round(jsonMark.getString("ball_time"),0).toString()); // 转速 - oneMap.put("ball_speed", jsonMark.getString("ball_speed")); + oneMap.put("ball_speed", NumberUtil.round(jsonMark.getString("ball_speed"),0).toString()); // 原料总碳 oneMap.put("c_balance", jsonMark.getString("c_balance")); @@ -475,7 +475,7 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService { } mapFL.put("class_name", class_name); mapFL.put("dtl_pcsn", json.getString("dtl_pcsn")); - mapFL.put("formula_qty", NumberUtil.round(json.getString("formula_qty"), 3).toString()); + mapFL.put("formula_qty", NumberUtil.round(json.getString("formula_qty"), 2).toString()); flData.add(mapFL); } }