From 98d763d27965d20a8d62d722631abc5d7e5c696f Mon Sep 17 00:00:00 2001 From: Leon <3066758958@qq.com> Date: Tue, 31 Aug 2021 10:00:20 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83ERP?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= 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 8f23e906..e8f44d3b 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 @@ -326,7 +326,7 @@ public class PodTemplateServiceImpl implements PodTemplateService { //更改派工单状态 sfcDispatchCommonService.updateSfcDispatchStatus(site, CommonMethods.getUser(), dispatchNo, DispatchStatusEnum.COMPLETE.getCode(),workHour); //报工 - sendErp(sfc, stepId, qty, BigDecimal.ZERO, workHour); + //sendErp(sfc, stepId, qty, BigDecimal.ZERO, workHour); } catch (Exception e) { ExceptionUtil.throwException(e); } From 30c739062dc6241f076d3958fe74db125ed0e49c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Tue, 31 Aug 2021 13:31:36 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=A0=B9=E6=8D=AEsfc=E6=9F=A5=E5=A4=84work?= =?UTF-8?q?Center?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anomaly/controller/AbnormalBillController.java | 8 ++++---- .../common/service/SfcDispatchCommonService.java | 2 +- .../mesnac/dispatch/mapper/SfcDispatchMapper.java | 2 +- .../service/impl/SfcDispatchServiceImpl.java | 5 ++--- .../src/main/resources/mapper/SfcDispatchMapper.xml | 6 +++--- .../meapi/service/impl/ShopOrderServiceImpl.java | 12 ++++++------ 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java index 89162c43..b0ab6527 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java @@ -361,12 +361,12 @@ public class AbnormalBillController { } - @GetMapping("/findResrceBySfc") - public R findResrceBySfc(SfcDispatchDto sfcDispatch){ + @GetMapping("/findResrceAndWorkCenterBySfc") + public R findResrceAndWorkCenterBySfc(SfcDispatchDto sfcDispatch){ try{ - return R.ok(sfcDispatchCommonService.findResrceBySfc(sfcDispatch)); + return R.ok(sfcDispatchCommonService.findResrceAndWorkCenterBySfc(sfcDispatch)); }catch (Exception e){ - return R.failed("根据sfc查找设备失败:"+e.getMessage()); + return R.failed("根据sfc查找设备和工作中心失败:"+e.getMessage()); } } diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/SfcDispatchCommonService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/SfcDispatchCommonService.java index 12d95b2c..9b85e83a 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/SfcDispatchCommonService.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/SfcDispatchCommonService.java @@ -43,7 +43,7 @@ public interface SfcDispatchCommonService { * @param sfcDispatch * @return */ - SfcDispatchDto findResrceBySfc(SfcDispatchDto sfcDispatch); + SfcDispatchDto findResrceAndWorkCenterBySfc(SfcDispatchDto sfcDispatch); /** * 查询派工单 diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java index fd7366f3..4ca9ed10 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java @@ -53,7 +53,7 @@ public interface SfcDispatchMapper extends BaseMapper { * @param site * @return */ - SfcDispatchDto findResrceBySfc(@Param("sfcDispatch")SfcDispatchDto sfcDispatch, @Param("site") String site); + SfcDispatchDto findResrceAndWorkCenterBySfc(@Param("sfcDispatch")SfcDispatchDto sfcDispatch, @Param("site") String site); SfcDispatchDto findSfcDispatchBySfc(@Param("site")String site, @Param("dto")SfcDispatchDto sfcDispatch); diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java index 493b80f6..1192b2e5 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java @@ -691,10 +691,9 @@ public class SfcDispatchServiceImpl extends ServiceImpl - + SELECT ZSD2.RESRCE,ZSD2.WORK_CENTER WORK_CENTER FROM SFC S INNER JOIN SFC_ROUTING SR ON SR.SFC_BO = S.HANDLE INNER JOIN SFC_ROUTER ST ON ST.SFC_ROUTING_BO = SR.HANDLE INNER JOIN SFC_STEP SS ON SS.SFC_ROUTER_BO = ST.HANDLE AND (SS.QTY_IN_QUEUE > 0 OR SS.QTY_IN_WORK > 0) LEFT JOIN Z_SFC_DISPATCH ZSD2 ON ZSD2.DISPATCH_NO = S.SFC || '-' || SS.STEP_ID WHERE S.SITE = #{site} - AND ZSD2.RESRCE IS NOT NULL AND S.SFC = #{sfcDispatch.sfc} + AND S.SFC = #{sfcDispatch.sfc}