From f8f07c0124d755cad5b6f25601dee782577e5fc7 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 2 Aug 2022 09:30:29 +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 --- .../nl/wms/pcs/service/impl/ProductplanSumServiceImpl.java | 6 +++++- .../nl/wms/pcs/service/impl/ProductplanprocServiceImpl.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ProductplanSumServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ProductplanSumServiceImpl.java index 63fafe50..6daf22c2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ProductplanSumServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ProductplanSumServiceImpl.java @@ -2,6 +2,7 @@ package org.nl.wms.pcs.service.impl; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.NumberUtil; @@ -180,6 +181,9 @@ public class ProductplanSumServiceImpl implements ProductplanSumService { String product_type_name = String.valueOf(map.get(5)); Long product_weight = Long.valueOf((String) map.get(6)); String plan_finish_date = String.valueOf(map.get(7)); + plan_finish_date = plan_finish_date.replace('/','-'); + DateTime date = DateUtil.parse(plan_finish_date, "yyyy-MM-dd"); + plan_finish_date = DateUtil.formatDate(date); String remark = String.valueOf(map.get(8)); //校验数据准确性 JSONObject jsonTab = WQL.getWO("QPCS_IF_PRODUCTPLANPROC02").addParam("flag", "2").addParam("code", plan_org_code).process().uniqueResult(0); @@ -222,7 +226,7 @@ public class ProductplanSumServiceImpl implements ProductplanSumService { dto.setRemark(remark); dto.setTask_code(CodeUtil.getNewCode("PCS_TASK_CODE")); //判断表里有没有此条记录 - JSONObject jsonObject = planProcTab.query("plan_org_code = '" + plan_org_code + "' and plan_month = '" + plan_month + "' and material_code ='" + material_code + "'").uniqueResult(0); + JSONObject jsonObject = planProcTab.query("plan_org_code = '" + plan_org_code + "' and plan_month = '" + plan_month + "' and material_code ='" + material_code + "' and plan_finish_date = '"+plan_finish_date+"'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonObject)) { //如果是空的就插入两张表 planProcTab.insert(JSONObject.parseObject(JSON.toJSONString(dto))); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ProductplanprocServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ProductplanprocServiceImpl.java index 2ffee0c2..35c4e5c3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ProductplanprocServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ProductplanprocServiceImpl.java @@ -2,6 +2,7 @@ package org.nl.wms.pcs.service.impl; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; @@ -196,6 +197,9 @@ public class ProductplanprocServiceImpl implements ProductplanprocService { String product_type_name = String.valueOf(map.get(5)); Long product_weight = Long.valueOf((String) map.get(6)); String plan_finish_date = String.valueOf(map.get(7)); + plan_finish_date = plan_finish_date.replace('/','-'); + DateTime date = DateUtil.parse(plan_finish_date, "yyyy-MM-dd"); + plan_finish_date = DateUtil.formatDate(date); String remark = String.valueOf(map.get(8)); //校验数据准确性 JSONObject jsonTab = WQL.getWO("QPCS_IF_PRODUCTPLANPROC02").addParam("flag", "2").addParam("code", plan_org_code).process().uniqueResult(0); @@ -238,7 +242,7 @@ public class ProductplanprocServiceImpl implements ProductplanprocService { dto.setRemark(remark); dto.setTask_code(CodeUtil.getNewCode("PCS_TASK_CODE")); //判断表里有没有此条记录 - JSONObject jsonObject = planProcTab.query("plan_org_code = '" + plan_org_code + "' and plan_month = '" + plan_month + "' and material_code ='" + material_code + "'").uniqueResult(0); + JSONObject jsonObject = planProcTab.query("plan_org_code = '" + plan_org_code + "' and plan_month = '" + plan_month + "' and material_code ='" + material_code + "' and plan_finish_date = '"+plan_finish_date+"'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonObject)) { //如果是空的就插入两张表 planProcTab.insert(JSONObject.parseObject(JSON.toJSONString(dto)));