From 2a52489c41ff944aab902e325ac3c10000ba98a1 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 22 May 2024 20:57:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=8E=92=E6=9F=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/QcCheckTaskIncomeController.java | 13 ++++++++++--- .../op/quality/mapper/QcCheckTaskIncomeMapper.java | 3 +++ .../quality/service/IQcCheckTaskIncomeService.java | 3 +++ .../service/impl/QcCheckTaskIncomeServiceImpl.java | 6 ++++++ .../mapper/quality/QcCheckTaskIncomeMapper.xml | 8 ++++++++ 5 files changed, 30 insertions(+), 3 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java index 9e318ff92..be1a4f805 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java @@ -195,7 +195,6 @@ public class QcCheckTaskIncomeController extends BaseController { logger.info("来料信息查询请求：" + JSONObject.toJSONString(mapBom)); R incomeR = remoteSapService.inComingCheck(mapBom); if(incomeR.getCode()==500){ - logger.info("来料信息查询请求：" + JSONObject.toJSONString(incomeR)); return AjaxResult.error(JSONObject.toJSONString(incomeR)); } logger.info("来料信息查询结果：" + JSONObject.toJSONString(incomeR)); @@ -216,13 +215,21 @@ public class QcCheckTaskIncomeController extends BaseController { if(!CollectionUtils.isEmpty(newIncomes)){ logger.info("工厂来料检验任务生成参数：" + JSONObject.toJSONString(newIncomes)); for(QcCheckTaskIncomeDTO income:newIncomes){ + //供应商+物料编码+数量+来料时间 + QcCheckTaskIncome hasTask = qcCheckTaskIncomeService.hasIncomeTask(income); + if(hasTask != null){ + logger.info(poolName + "工厂的" + income.getAttr1()+"来料检验创建任务重复++++++++++"+ + JSONObject.toJSONString(income)); + continue; + } + AjaxResult ajaxResult = createIncomeTask(income); if(ajaxResult.isSuccess()){ successNum = successNum + 1; - logger.info(poolName + "工厂的" + income.getCheckNo()+"来料检验创建任务成功++++++++++"); + logger.info(poolName + "工厂的" + income.getAttr1()+"来料检验创建任务成功++++++++++"); }else if(ajaxResult.isError()){ failNum = failNum +1; - logger.info(poolName + "工厂的" + income.getCheckNo()+"来料检验创建任务失败++++++++++"); + logger.info(poolName + "工厂的" + income.getAttr1()+"来料检验创建任务失败++++++++++"); } } }else{ diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java index 7d8b3553e..94a3c556c 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java @@ -8,6 +8,7 @@ import com.op.quality.domain.*; import com.op.system.api.domain.SysDictData; import com.op.system.api.domain.SysNoticeGroup; import com.op.system.api.domain.SysUser; +import com.op.system.api.domain.quality.QcCheckTaskIncomeDTO; import com.op.system.api.domain.quality.QcUserMaterialDTO; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; @@ -126,4 +127,6 @@ public interface QcCheckTaskIncomeMapper { Map getWxIdMap(List userCodes); List getNoticesGroup(SysNoticeGroup noticeQo); + + QcCheckTaskIncome hasIncomeTask(QcCheckTaskIncomeDTO income); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java index b0c97b031..0e49b7ee7 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java @@ -5,6 +5,7 @@ import java.util.List; import com.op.quality.domain.*; import com.op.system.api.domain.SysUser; +import com.op.system.api.domain.quality.QcCheckTaskIncomeDTO; /** * 来料检验Service接口 @@ -102,4 +103,6 @@ public interface IQcCheckTaskIncomeService { List getTodayIncomeLists(); public String getWeightValue(String id); + + QcCheckTaskIncome hasIncomeTask(QcCheckTaskIncomeDTO income); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index ad2621a64..0a0c225ee 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -21,6 +21,7 @@ import com.op.system.api.RemoteOpenService; import com.op.system.api.domain.SysNoticeGroup; import com.op.system.api.domain.SysUser; import com.op.system.api.domain.dto.WechartDTO; +import com.op.system.api.domain.quality.QcCheckTaskIncomeDTO; import com.op.system.api.domain.quality.QcUserMaterialDTO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -924,5 +925,10 @@ public class QcCheckTaskIncomeServiceImpl implements return qcProCheckService.getWeightInfo(qcCheckTaskDetail); } + @Override + public QcCheckTaskIncome hasIncomeTask(QcCheckTaskIncomeDTO income) { + return qcCheckTaskIncomeMapper.hasIncomeTask(income); + } + } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml index b9636d23e..9d795b8b0 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml @@ -512,6 +512,14 @@ #{userCode} + From f79c71bebe44776678392b0205f5deb967468d61 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Thu, 23 May 2024 11:36:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?wms=E6=88=90=E5=93=81sap=E6=94=B6=E8=8E=B7?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=B8=AD=E8=BF=87=E8=B4=A6=E6=97=B6=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E7=9A=84=E6=88=AA=E5=8F=96=E8=A7=84=E5=88=99=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WmsProductPutServiceImpl.java | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index 6ba5304ab..a982fff0d 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -487,7 +487,8 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { map.put("QUANTITY", mesReportWork.getQuantityQualified()); map.put("ERFME", mesReportWork.getUnit()); if (mesReportWork.getBatch().length()>12){ - String batch = mesReportWork.getBatch().substring(12); + //String batch = mesReportWork.getBatch().substring(12); + String batch = InterceptionRules(mesReportWork.getBatch()); map.put("BATCH", batch); }else { map.put("BATCH", mesReportWork.getBatch()); @@ -526,7 +527,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { map.put("QUANTITY", mesReportWork.getQuantityQualified()); map.put("ERFME", mesReportWork.getUnit()); if (mesReportWork.getBatch().length()>12){ - String batch = mesReportWork.getBatch().substring(12); + String batch = InterceptionRules(mesReportWork.getBatch()); map.put("BATCH", batch); }else { map.put("BATCH", mesReportWork.getBatch()); @@ -583,6 +584,10 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { + + + + @Override public ProOrderWorkorder selectWmsOdsWhiteEmbryoInhAnd(WmsOdsWhiteEmbryoIn wmsOdsWhiteEmbryoIns) { //pro order workorder @@ -1133,4 +1138,16 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { public List selectWmsRuturnPutEmbryoList(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) { return wmsRuturnPutEmbryoMapper.selectWmsRuturnPutEmbryoList(wmsRuturnPutEmbryo); } + + + + //去除空格，截取规则，例子：20270106LJ20240107CBCD0J——》240107CBCD + public String InterceptionRules(String batchString){ + boolean containsSpace = batchString.contains(" "); + if (containsSpace) {//去除空格 + batchString = batchString.replace(" ", ""); + } + batchString =batchString.substring(12,22); + return batchString; + } }