From f3786f266577111242e84e9915bd5ffa6ef841f3 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Mon, 19 Sep 2022 17:39:06 +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 --- .../service/impl/WorkOrderServiceImpl.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) 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 deffdc4c..1f89c256 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 @@ -127,6 +127,15 @@ public class WorkOrderServiceImpl implements WorkOrdereService { json.put("create_time", now); json.put("sysdeptid", deptId); json.put("syscompanyid", deptId); + String create_mode = json.getString("create_mode"); + if("01".equals(create_mode)){ + String planstart_time = json.getString("planstart_time"); + Date date = DateUtil.parse(planstart_time); + int days = this.getDays(json.getString("material_id")); + Date planend_date = DateUtil.offsetDay(date,days-1); + String planend_time = DateUtil.formatDate(planend_date).substring(0,10); + json.put("planend_time",planend_time+" 23:59:59"); + } mstTab.insert(json); this.updatePcsn(json); } @@ -167,6 +176,15 @@ public class WorkOrderServiceImpl implements WorkOrdereService { this.updatePcsn(whereJson); } } + String create_mode = whereJson.getString("create_mode"); + if("01".equals(create_mode)){ + String planstart_time = whereJson.getString("planstart_time"); + Date date = DateUtil.parse(planstart_time); + int days = this.getDays(whereJson.getString("material_id")); + Date planend_date = DateUtil.offsetDay(date,days-1); + String planend_time = DateUtil.formatDate(planend_date).substring(0,10); + whereJson.put("planend_time",planend_time+" 23:59:59"); + } mstTab.update(whereJson); } @@ -818,6 +836,19 @@ public class WorkOrderServiceImpl implements WorkOrdereService { return ret; } + @Transactional(rollbackFor = Exception.class) + public int getDays(String material_id) { + JSONArray ProcessRoutes = WQL.getWO("QPDM_PRODUCTPLANPROC").addParam("flag","5") + .addParam("material_code",material_id).process().getResultJSONArray(0); + int days = 0; + for(int i=0;i