root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
liuxy
2022-08-02 09:30:29 +08:00
parent e36f56c221
commit f8f07c0124
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ProductplanSumServiceImpl.java
View File

@@ -2,6 +2,7 @@
package org.nl.wms.pcs.service.impl; package org.nl.wms.pcs.service.impl;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.NumberUtil;
@@ -180,6 +181,9 @@ public class ProductplanSumServiceImpl implements ProductplanSumService {
String product_type_name = String.valueOf(map.get(5)); String product_type_name = String.valueOf(map.get(5));
Long product_weight = Long.valueOf((String) map.get(6)); Long product_weight = Long.valueOf((String) map.get(6));
String plan_finish_date = String.valueOf(map.get(7)); 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)); 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); 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.setRemark(remark);
dto.setTask_code(CodeUtil.getNewCode("PCS_TASK_CODE")); 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)) { if (ObjectUtil.isEmpty(jsonObject)) {
//如果是空的就插入两张表 //如果是空的就插入两张表
planProcTab.insert(JSONObject.parseObject(JSON.toJSONString(dto))); planProcTab.insert(JSONObject.parseObject(JSON.toJSONString(dto)));

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ProductplanprocServiceImpl.java
View File

@@ -2,6 +2,7 @@
package org.nl.wms.pcs.service.impl; package org.nl.wms.pcs.service.impl;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
@@ -196,6 +197,9 @@ public class ProductplanprocServiceImpl implements ProductplanprocService {
String product_type_name = String.valueOf(map.get(5)); String product_type_name = String.valueOf(map.get(5));
Long product_weight = Long.valueOf((String) map.get(6)); Long product_weight = Long.valueOf((String) map.get(6));
String plan_finish_date = String.valueOf(map.get(7)); 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)); 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); 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.setRemark(remark);
dto.setTask_code(CodeUtil.getNewCode("PCS_TASK_CODE")); 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)) { if (ObjectUtil.isEmpty(jsonObject)) {
//如果是空的就插入两张表 //如果是空的就插入两张表
planProcTab.insert(JSONObject.parseObject(JSON.toJSONString(dto))); planProcTab.insert(JSONObject.parseObject(JSON.toJSONString(dto)));