From 1fcd220c1dc081ef0fb6a8a2e3e7e84c4f611991 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Fri, 17 Sep 2021 14:12:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=89=80=E6=9C=89?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProdReadyTaskServiceImpl.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java index b57c5b3c..95ffed54 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java @@ -494,18 +494,20 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl stepOperationList = routerStepService.findRouterOperationByRouterBo(site, router.getHandle()); + StringBuilder operationDesc = new StringBuilder(); for (int i = 0; i < stepOperationList.size(); i++) { RouterStepDto stepOperation = stepOperationList.get(i); - if (stepOperation.getStepId().equals(prodReadyTask.getStepId())) { - seq = i; + operationDesc.append(stepOperation.getOperationDesc()) ; + if (i!=stepOperationList.size()-1){ + operationDesc.append(","); } } - if (seq != stepOperationList.size() - 1) { - RouterStepDto stepOperation = stepOperationList.get(seq + 1); - labelPrintDto.setOperation(stepOperation.getOperationDesc()); - } + labelPrintDto.setOperation(operationDesc.toString()); + labelPrintDtoList.add(labelPrintDto); printData = JSON.toJSONString(labelPrintDtoList); //打印记录 From 23cf4f9910df3d5adecdc248b3f70b63827ec737 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Fri, 17 Sep 2021 14:30:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E4=B9=98=E5=B7=A5=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/production/service/impl/PodTemplateServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java index e4eac07b..b07adae2 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java @@ -356,7 +356,7 @@ public class PodTemplateServiceImpl implements PodTemplateService { SfcDispatchDto sfcdispatch = new SfcDispatchDto(); sfcdispatch.setHandle(HandleEnum.SFC_DISPATCH.getHandle(site, dispatchNo)); sfcdispatch = sfcDispatchCommonService.findSfcDispatchBySfc(sfcdispatch); - sendErp(sfc, stepId, qty, BigDecimal.ZERO, sfcdispatch.getProdHours()); + sendErp(sfc, stepId, qty, BigDecimal.ZERO, qty.multiply(sfcdispatch.getProdHours())); } } catch (Exception e) { ExceptionUtil.throwException(e); From 8562cd2707420b8e8f9e1f96ffc3b80f33168be0 Mon Sep 17 00:00:00 2001 From: zpl Date: Fri, 17 Sep 2021 14:57:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=95=85=E9=9A=9C=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equip/service/impl/ResourceFaultReceiveServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java index 28cedc94..8897c3f2 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java @@ -78,7 +78,7 @@ public class ResourceFaultReceiveServiceImpl extends ServiceImpl Date: Fri, 17 Sep 2021 15:48:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../integration/service/impl/InterfaceServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java b/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java index c3b2dcac..62384765 100644 --- a/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java +++ b/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java @@ -74,9 +74,9 @@ public class InterfaceServiceImpl implements InterfaceService { public void itemSync(String site, ItemSyncRequest itemSyncRequest) throws Exception{ //物料 String item = itemSyncRequest.getITEM(); - //版本:默认值A - String revision = itemSyncRequest.getREVISION(); - revision = StringUtil.notBlank(revision) ? revision : "A"; + //版本:MES物料只有一个版本：A + String revision = "A"; + //revision = StringUtil.notBlank(revision) ? revision : "A"; //物料描述 String itemDescription = itemSyncRequest.getMAKTX(); //计量单位