From 69ec898a9d7abdde92f22777a76c09ba5fd749cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Wed, 21 Jul 2021 13:11:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=B6=88=E6=81=AF=E5=8F=91?= =?UTF-8?q?=E9=80=81=E5=92=8C=E7=94=9F=E4=BA=A7=E6=93=8D=E4=BD=9C=E5=91=98?= =?UTF-8?q?=E9=9D=A2=E6=9D=BFpod?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meapi/controller/SfcController.java | 5 +++ .../foreverwin/mesnac/meapi/dto/SfcDto.java | 27 +++++++++++++++ .../mesnac/meapi/mapper/SfcMapper.java | 2 ++ .../mesnac/meapi/mapper/UserGroupMapper.java | 6 ++++ .../mesnac/meapi/mapper/WorkCenterMapper.java | 7 ++++ .../mesnac/meapi/model/UserGroup.java | 33 +++++++++++++------ .../mesnac/meapi/service/SfcService.java | 2 ++ .../meapi/service/impl/SfcServiceImpl.java | 7 ++++ meapi/src/main/resources/mapper/SfcMapper.xml | 5 +++ .../main/resources/mapper/UserGroupMapper.xml | 20 +++++++++++ .../resources/mapper/WorkCenterMapper.xml | 14 ++++++++ .../controller/PodTemplateController.java | 10 ++++++ .../production/mapper/SfcCrossMapper.java | 2 ++ .../service/PodTemplateService.java | 3 ++ .../service/impl/PodTemplateServiceImpl.java | 9 +++++ .../main/resources/mapper/SfcCrossMapper.xml | 25 ++++++++++++++ 16 files changed, 167 insertions(+), 10 deletions(-) diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java index eb436400..c865e264 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java @@ -165,4 +165,9 @@ public class SfcController { return R.ok(sfcService.findOperationBySfc(sfc)); } + @GetMapping("/findSfcByResrce") + public R findSfcByResrce(String resource,Sfc sfc){ + return R.ok(sfcService.findSfcByResrce(resource,sfc)); + } + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/SfcDto.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/SfcDto.java index 2c3f0fb3..42c35bc0 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/SfcDto.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/SfcDto.java @@ -15,6 +15,9 @@ public class SfcDto extends Sfc { private String workCenter; private String dispatchNo; private String stepId; + private String plannedStartDate; + private String plannedCompDate; + private String workOrder; public String getStepId() { return stepId; @@ -103,4 +106,28 @@ public class SfcDto extends Sfc { public void setWorkCenter(String workCenter) { this.workCenter = workCenter; } + + public String getPlannedStartDate() { + return plannedStartDate; + } + + public void setPlannedStartDate(String plannedStartDate) { + this.plannedStartDate = plannedStartDate; + } + + public String getPlannedCompDate() { + return plannedCompDate; + } + + public void setPlannedCompDate(String plannedCompDate) { + this.plannedCompDate = plannedCompDate; + } + + public String getWorkOrder() { + return workOrder; + } + + public void setWorkOrder(String workOrder) { + this.workOrder = workOrder; + } } diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java index aeb7d606..cbcd832d 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java @@ -33,4 +33,6 @@ public interface SfcMapper extends BaseMapper { IPage pageByResrce(Page pagePlus,@Param("ew") QueryWrapper queryWrapper,@Param("locale")String locale); String findOperationBySfc(@Param("site")String site,@Param("sfc")String sfc); + + String findSfcByResrce(@Param("site")String site,@Param("resource")String resource,@Param("sfc")Sfc sfc); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java index 0833fc51..b6259730 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java @@ -20,4 +20,10 @@ public interface UserGroupMapper extends BaseMapper { int checkUserGroup(@Param("site")String site, @Param("list")List item); + //根据升级的用户组得到正确的用户组 + List getUserGroupListByGroups(@Param("site")String site,@Param("list")List item); + + UserGroup getCustomFieldByGroup(@Param("site")String site, + @Param("userGroup")String userGroup); + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/WorkCenterMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/WorkCenterMapper.java index da317365..087c9907 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/WorkCenterMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/WorkCenterMapper.java @@ -21,4 +21,11 @@ public interface WorkCenterMapper extends BaseMapper { IPage workCenterlist(IPage page, @Param("site") String site, @Param("workCenter") String workCenter); List getWorkShopList(@Param("site")String site, @Param("locale")String locale); + + WorkCenter findWorkCenterDescriptionByResrce(@Param("resrceBo")String resourceBo, + @Param("locale")String locale); + + WorkCenter findWorkCenterDescriptionByWorkCenter(@Param("site")String site, + @Param("workCenter")String workCenter, + @Param("locale")String locale); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/UserGroup.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/UserGroup.java index e9878020..67c4e320 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/UserGroup.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/UserGroup.java @@ -1,20 +1,13 @@ package com.foreverwin.mesnac.meapi.model; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import java.io.Serializable; import java.time.LocalDateTime; -import java.io.Serializable; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import com.baomidou.mybatisplus.annotation.IdType; /** *

@@ -47,6 +40,10 @@ public class UserGroup extends Model { private LocalDateTime createdDateTime; @TableField("MODIFIED_DATE_TIME") private LocalDateTime modifiedDateTime; + @TableField(exist = false) + private String messageNoticeLevel; + @TableField(exist = false) + private String messageNoticeTime; public String getHandle() { @@ -113,7 +110,23 @@ public class UserGroup extends Model { this.modifiedDateTime = modifiedDateTime; } -public static final String HANDLE = "HANDLE"; + public String getMessageNoticeLevel() { + return messageNoticeLevel; + } + + public void setMessageNoticeLevel(String messageNoticeLevel) { + this.messageNoticeLevel = messageNoticeLevel; + } + + public String getMessageNoticeTime() { + return messageNoticeTime; + } + + public void setMessageNoticeTime(String messageNoticeTime) { + this.messageNoticeTime = messageNoticeTime; + } + + public static final String HANDLE = "HANDLE"; public static final String CHANGE_STAMP = "CHANGE_STAMP"; diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java index d4ab900d..321aacda 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java @@ -52,4 +52,6 @@ public interface SfcService extends IService { String findOperationBySfc(String sfc); + List findSfcByResrce(String resource,Sfc sfc); + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java index 74b799b6..dd9e8d5c 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java @@ -78,4 +78,11 @@ public class SfcServiceImpl extends ServiceImpl implements SfcSe String site = CommonMethods.getSite(); return sfcMapper.findOperationBySfc(site,sfc); } + + @Override + public List findSfcByResrce(String resource,Sfc sfc) { + String site = CommonMethods.getSite(); + sfcMapper.findSfcByResrce(site,resource,sfc); + return null; + } } \ No newline at end of file diff --git a/meapi/src/main/resources/mapper/SfcMapper.xml b/meapi/src/main/resources/mapper/SfcMapper.xml index 144aed17..454a9683 100644 --- a/meapi/src/main/resources/mapper/SfcMapper.xml +++ b/meapi/src/main/resources/mapper/SfcMapper.xml @@ -684,4 +684,9 @@ WHERE (SS.QTY_IN_QUEUE > 0 OR SS.QTY_IN_WORK > 0) AND S.SFC = #{sfc} AND S.SITE = #{site} + + + diff --git a/meapi/src/main/resources/mapper/UserGroupMapper.xml b/meapi/src/main/resources/mapper/UserGroupMapper.xml index 40055aa4..d960bee9 100644 --- a/meapi/src/main/resources/mapper/UserGroupMapper.xml +++ b/meapi/src/main/resources/mapper/UserGroupMapper.xml @@ -12,6 +12,8 @@ + + @@ -338,4 +340,22 @@ ) + + + diff --git a/meapi/src/main/resources/mapper/WorkCenterMapper.xml b/meapi/src/main/resources/mapper/WorkCenterMapper.xml index 3a7f9a50..77fe573d 100644 --- a/meapi/src/main/resources/mapper/WorkCenterMapper.xml +++ b/meapi/src/main/resources/mapper/WorkCenterMapper.xml @@ -486,4 +486,18 @@ INNER JOIN WORK_CENTER_T CT ON CT.WORK_CENTER_BO = WC.HANDLE AND CT.LOCALE = #{locale} WHERE WC.WC_CATEGORY = 'LEVEL4' AND WC.SITE = #{site} + + + + diff --git a/production/src/main/java/com/foreverwin/mesnac/production/controller/PodTemplateController.java b/production/src/main/java/com/foreverwin/mesnac/production/controller/PodTemplateController.java index e45ae9db..04bf6a3b 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/controller/PodTemplateController.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/controller/PodTemplateController.java @@ -2,6 +2,7 @@ package com.foreverwin.mesnac.production.controller; import com.foreverwin.mesnac.meapi.dto.SfcDto; import com.foreverwin.mesnac.meapi.dto.WorkCenterDto; +import com.foreverwin.mesnac.meapi.model.Sfc; import com.foreverwin.mesnac.production.service.PodTemplateService; import com.foreverwin.modular.core.util.R; import org.springframework.beans.factory.annotation.Autowired; @@ -73,4 +74,13 @@ public class PodTemplateController { public R getSfcInfo(SfcDto sfcDto) { return R.ok(podTemplateService.getSfcInfo(sfcDto)); } + + /** + * 生产操作员工作界面 + */ + @ResponseBody + @GetMapping("/getInfoBySfc") + public R getSfcInfo(Sfc sfc) { + return R.ok(podTemplateService.getInfoBySfc(sfc)); + } } diff --git a/production/src/main/java/com/foreverwin/mesnac/production/mapper/SfcCrossMapper.java b/production/src/main/java/com/foreverwin/mesnac/production/mapper/SfcCrossMapper.java index 59d3ad3b..78cc80b9 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/mapper/SfcCrossMapper.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/mapper/SfcCrossMapper.java @@ -70,4 +70,6 @@ public interface SfcCrossMapper extends BaseMapper { List getSfcListByResrce(@Param("site") String site, @Param("resrce") String resrce,@Param("locale") String locale); Integer resourceCheck(@Param("resrceBO")String resrceBO, @Param("dateTime")LocalDateTime dateTime); + + SfcDto getInfoBySfc(@Param("sfc")Sfc sfc); } diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/PodTemplateService.java b/production/src/main/java/com/foreverwin/mesnac/production/service/PodTemplateService.java index a942e556..c10c26d3 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/PodTemplateService.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/PodTemplateService.java @@ -2,6 +2,7 @@ package com.foreverwin.mesnac.production.service; import com.foreverwin.mesnac.meapi.dto.SfcDto; import com.foreverwin.mesnac.meapi.dto.WorkCenterDto; +import com.foreverwin.mesnac.meapi.model.Sfc; import java.util.Map; @@ -16,4 +17,6 @@ public interface PodTemplateService { void sfcComplete(Map map); + SfcDto getInfoBySfc(Sfc sfc); + } 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 136a8346..74cd6428 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 @@ -249,6 +249,8 @@ public class PodTemplateServiceImpl implements PodTemplateService { }); } + + void senErp() throws RemoteException { String shopOrder = "SO20210714"; String stepId = "OP001"; @@ -297,4 +299,11 @@ public class PodTemplateServiceImpl implements PodTemplateService { String message = outHolder.value[1].getMsg(); System.out.println("ERP接口返回：状态:" + status + ",消息:" + message); } + + @Override + public SfcDto getInfoBySfc(Sfc sfc) { + String site = CommonMethods.getSite(); + sfc.setSite(site); + return sfcCrossMapper.getInfoBySfc(sfc); + } } diff --git a/production/src/main/resources/mapper/SfcCrossMapper.xml b/production/src/main/resources/mapper/SfcCrossMapper.xml index a76da232..17fd4678 100644 --- a/production/src/main/resources/mapper/SfcCrossMapper.xml +++ b/production/src/main/resources/mapper/SfcCrossMapper.xml @@ -162,4 +162,29 @@ WHERE sfc.site = #{site} and + +