diff --git a/common/pom.xml b/common/pom.xml
index 86135f97..765582f8 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -29,11 +29,6 @@
modular-melib
-
- com.foreverwin.mesnac
- meapi
-
-
org.apache.poi
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java b/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java
index c4faef80..45d6b1df 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java
@@ -14,6 +14,15 @@ public enum HandleEnum {
/**车间作业控制*/
SFC( "SFCBO:", "SFCBO:{0},{1}" ),
+ /**zhaungtai**/
+ STATUS("StatusBO:", "StatusBO:{0},{1}"),
+
+ /**zhaungtai**/
+ RESOURCE_TYPE("ResourceTypeBO:", "ResourceTypeBO:{0},{1}"),
+
+ /****/
+ RESOURCE_TYPE_RESOURCEBO("ResourceTypeResourceBO","ResourceTypeResourceBO:{0},{1}"),
+
/**车间作业控制*/
SFC_BOM( "SFCBOMBO:", "SFCBOMBO:{0}" ),
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/util/StringUtil.java b/common/src/main/java/com/foreverwin/mesnac/common/util/StringUtil.java
index 60ca0230..d4e2fa5c 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/util/StringUtil.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/util/StringUtil.java
@@ -91,6 +91,19 @@ public class StringUtil
}
return -1;
}
+
+ static public boolean isBlank(String str)
+ {
+ boolean isBlank = false;
+ if( str == null ) isBlank = true;
+ else if( str.trim().equals( "" ) ) isBlank = true;
+ return isBlank;
+ }
+
+ static public boolean notBlank(String str)
+ {
+ return !isBlank(str);
+ }
public static boolean isEmpty(String str)
{
diff --git a/equip/pom.xml b/equip/pom.xml
index 6605f683..120e07e8 100644
--- a/equip/pom.xml
+++ b/equip/pom.xml
@@ -34,6 +34,11 @@
modular-melib
+
+ com.foreverwin.mesnac
+ common
+
+
com.foreverwin.mesnac
meapi
diff --git a/equip/src/main/java/com/foreverwin/com/equip/controller/EquipTypeController.java b/equip/src/main/java/com/foreverwin/com/equip/controller/EquipTypeController.java
deleted file mode 100644
index f3493024..00000000
--- a/equip/src/main/java/com/foreverwin/com/equip/controller/EquipTypeController.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.foreverwin.com.equip.controller;
-
-public class EquipTypeController {
-}
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/EmailGroupController.java b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/EmailGroupController.java
new file mode 100644
index 00000000..f9204c4b
--- /dev/null
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/EmailGroupController.java
@@ -0,0 +1,64 @@
+package com.foreverwin.mesnac.equip.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.foreverwin.modular.core.util.CommonMethods;
+import com.foreverwin.modular.core.util.R;
+import com.foreverwin.mesnac.equip.model.EmailGroup;
+import com.foreverwin.mesnac.equip.service.EmailGroupService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ *
+ * @author Max
+ * @since 2021-03-11
+ */
+@RestController
+@RequestMapping("/Z-EMAIL-GROUP")
+public class EmailGroupController {
+
+ @Autowired
+ public EmailGroupService emailGroupService;
+
+ /**
+ * 根据id查询
+ *
+ * @param emailGroup 主键
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("/search/{emailGroup}")
+ public R getEmailGroupById(@PathVariable("emailGroup") String emailGroup) {
+ String site = CommonMethods.getSite();
+ EmailGroup _emailGroup = new EmailGroup();
+ _emailGroup.setSite( site );
+ _emailGroup.setEmailGroup( emailGroup );
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity( _emailGroup );
+ EmailGroup eg = emailGroupService.getOne( queryWrapper );
+ if ( eg == null ) {
+ return R.failed( "邮件群组["+emailGroup+"]不存在" );
+ }
+ return R.ok(eg);
+ }
+
+ /**
+ * 查询所有数据
+ *
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("")
+ public R getEmailGroupList(EmailGroup emailGroup){
+ String site = CommonMethods.getSite();
+ List result;
+ emailGroup.setSite( site );
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(emailGroup);
+ result = emailGroupService.list(queryWrapper);
+ return R.ok(result);
+ }
+
+}
\ No newline at end of file
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/EquipController.java b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/EquipController.java
new file mode 100644
index 00000000..32bb2b92
--- /dev/null
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/EquipController.java
@@ -0,0 +1,193 @@
+package com.foreverwin.mesnac.equip.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.foreverwin.mesnac.equip.model.Equip;
+import com.foreverwin.mesnac.equip.model.EquipType;
+import com.foreverwin.mesnac.equip.model.EquipTypeEquip;
+import com.foreverwin.mesnac.equip.service.EquipService;
+import com.foreverwin.mesnac.equip.service.EquipTypeEquipService;
+import com.foreverwin.mesnac.equip.service.EquipTypeService;
+import com.foreverwin.mesnac.meapi.model.CustomFields;
+import com.foreverwin.mesnac.meapi.service.CustomFieldsService;
+import com.foreverwin.mesnac.meapi.util.StringUtils;
+import com.foreverwin.modular.core.exception.BusinessException;
+import com.foreverwin.modular.core.util.CommonMethods;
+import com.foreverwin.modular.core.util.R;
+import com.foreverwin.mesnac.common.enums.HandleEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ * @author Max
+ * @since 2020-10-10
+ */
+@RestController
+@RequestMapping("/EQUIP")
+public class EquipController {
+
+ @Autowired
+ public EquipService equipService;
+ @Autowired
+ public EquipTypeEquipService equipTypeEquipService;
+ @Autowired
+ public CustomFieldsService customFieldsService;
+ @Autowired
+ public EquipTypeService equipTypeService;
+
+ /**
+ * 根据设备查询
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("/search/{equip}")
+ public R getEquipById(@PathVariable("equip") String equip) {
+ String site = CommonMethods.getSite();
+ String handle = HandleEnum.RESOURCE.getHandle(site, equip);
+ String equipType = "";
+ Equip _equip = equipService.getById( handle );
+ if ( _equip == null ) {
+ return R.failed(null,"设备["+equip+"]不存在" );
+ }
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("EQUIP_BO",_equip.getHandle() );
+ EquipTypeEquip equipTypeEquip = equipTypeEquipService.getOne( queryWrapper );
+ if ( equipTypeEquip != null ) {
+ String equipTypeBo = equipTypeEquip.getEquipTypeBo();
+ equipType = (equipTypeBo.split(":")[1]).split(",")[1];
+ }
+ //查询设备自定义数据
+ List statusList = customFieldsService.getCustomFields( handle,"STATUS" );
+ String status = "";
+ String department = "";
+ String serialNum = "";
+ if ( statusList.size() != 0 ) {
+ CustomFields statusField = statusList.get(0);
+ status = statusField.getValue();
+ }
+ List departmentList = customFieldsService.getCustomFields( handle,"DEPARTMENT" );
+ if ( departmentList.size() != 0 ) {
+ CustomFields departmentField = departmentList.get(0);
+ department = departmentField.getValue();
+ }
+ List serialNumberList = customFieldsService.getCustomFields( handle,"SERIAL_NUMBER" );
+ if ( serialNumberList.size() != 0 ) {
+ CustomFields serialNumberField = serialNumberList.get(0);
+ serialNum = serialNumberField.getValue();
+ }
+ _equip.setEquipType( equipType );
+ _equip.setStatus( status );
+ _equip.setDepartment( department );
+ _equip.setSerialNumber( serialNum );
+ return R.ok( _equip );
+ }
+
+ /**
+ * 设备弹出框
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("")
+ public R getEquipList(Equip equip){
+ String site = CommonMethods.getSite();
+ equip.setSite( site );
+ List result;
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(equip);
+ result = equipService.list(queryWrapper);
+ Collections.sort(result);
+ return R.ok(result);
+ }
+
+ /**
+ * 保存
+ * @param equip 传递的实体
+ * @return null 失败 实体成功
+ */
+ @ResponseBody
+ @PostMapping("/save")
+ public R save(@RequestBody Equip equip) {
+ String site = CommonMethods.getSite();
+ //校验设备类型是否存在 2020/12/04
+ String equipType = equip.getEquipType();
+ if ( StringUtils.notEmpty( equipType ) ) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ EquipType et = new EquipType();
+ et.setSite(site);
+ et.setEquipType( equipType );
+ queryWrapper.setEntity(et);
+ EquipType _et = equipTypeService.getOne( queryWrapper );
+ if ( _et == null ) {
+ throw BusinessException.build("设备类型不存在："+equipType);
+ }
+ }
+ //-----------------------------------------------------------------------------------------------
+ String handle = equip.getHandle();
+ String equipName = equip.getResrce();
+ String resourceHandle = HandleEnum.RESOURCE.getHandle(site, equipName);
+ equip.setHandle( resourceHandle );
+ String status = equip.getStatusBo();
+ String statusBo = HandleEnum.STATUS.getHandle(site, status);
+ equip.setSite( site );
+ equip.setStatusBo( statusBo );
+ equip.setCreatedDateTime( new Date() );
+ equip.setModifiedDateTime( new Date() );
+ //判断是更新还是新增 2020/12/01
+ Equip ep =equipService.getById( resourceHandle );
+ if ( ep != null && !ep.getHandle().equals(handle) ) {
+ throw BusinessException.build(equipName+" 已存在，请先检索");
+ }
+ //删除原先设备类型
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("EQUIP_BO", resourceHandle );
+ equipTypeEquipService.remove( queryWrapper );
+ //保存设备类型设备
+ String resourceType = equip.getEquipType();
+ if ( resourceType != null && !resourceType.equals("")) {
+ String resourceTypeHandle = HandleEnum.RESOURCE_TYPE.getHandle(site, resourceType);
+// String resourceTypeResourceHandle = HandleUtil.buildResourceTypeResourceHandle(resourceTypeHandle, resourceHandle);
+ String resourceTypeResourceHandle = HandleEnum.RESOURCE_TYPE_RESOURCEBO.getHandle(resourceTypeHandle,resourceHandle);
+ EquipTypeEquip equipTypeEquip = new EquipTypeEquip();
+ equipTypeEquip.setHandle(resourceTypeResourceHandle);
+ equipTypeEquip.setEquipTypeBo(resourceTypeHandle);
+ equipTypeEquip.setEquipBo(resourceHandle);
+ equipTypeEquipService.save(equipTypeEquip);
+ }
+ //保存设备自定义数据
+ String _status = equip.getStatus();
+ String _serialNumber = equip.getSerialNumber();
+ String _department = equip.getDepartment();
+ if (StringUtils.notEmpty( _status )) {
+ customFieldsService.setCustom(resourceHandle,"STATUS",_status);
+ }
+ if (StringUtils.notEmpty( _serialNumber )) {
+ customFieldsService.setCustom(resourceHandle,"SERIAL_NUMBER",_serialNumber);
+ }
+ if (StringUtils.notEmpty( _department )) {
+ customFieldsService.setCustom(resourceHandle,"DEPARTMENT",_department);
+ }
+ //保存或更新设备
+ return R.ok(equipService.saveOrUpdate( equip ),"保存成功");
+ }
+
+ /**
+ * 删除
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("/remove/{equip}")
+ public R removeById(@PathVariable("equip") String equip) {
+ String site = CommonMethods.getSite();
+ String handle = HandleEnum.RESOURCE.getHandle(site,equip);
+ //删除与设备类型的关系
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("EQUIP_BO",handle );
+ equipTypeEquipService.remove( queryWrapper );
+ //删除设备
+ return R.ok( equipService.removeById( handle ),"删除成功" );
+ }
+}
\ No newline at end of file
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/EquipTypeController.java b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/EquipTypeController.java
new file mode 100644
index 00000000..4e504e20
--- /dev/null
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/EquipTypeController.java
@@ -0,0 +1,125 @@
+package com.foreverwin.mesnac.equip.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.foreverwin.mesnac.common.enums.HandleEnum;
+import com.foreverwin.modular.core.exception.BusinessException;
+import com.foreverwin.modular.core.util.CommonMethods;
+import com.foreverwin.modular.core.util.R;
+import com.foreverwin.mesnac.equip.model.Equip;
+import com.foreverwin.mesnac.equip.model.EquipType;
+import com.foreverwin.mesnac.equip.model.EquipTypeEquip;
+import com.foreverwin.mesnac.equip.service.EquipTypeEquipService;
+import com.foreverwin.mesnac.equip.service.EquipTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ * @author Max
+ * @since 2020-10-10
+ */
+@RestController
+@RequestMapping("/Z-EQUIP-TYPE")
+public class EquipTypeController {
+
+ @Autowired
+ public EquipTypeService equipTypeService;
+ @Autowired
+ public EquipTypeEquipService equipTypeEquipService;
+
+ /**
+ * 根据设备类型查询
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("/search/{equipType}")
+ public R getEquipTypeById(@PathVariable("equipType") String equipType) {
+ String site = CommonMethods.getSite();
+ String handle = HandleEnum.RESOURCE_TYPE.getHandle(site,equipType);
+ EquipType _equipType = equipTypeService.getById( handle );
+ if ( _equipType == null ) {
+ return R.failed( null,"设备类型不存在" );
+ }
+ return R.ok( _equipType,"检索成功" );
+ }
+
+ /**
+ * 设备类型弹出框
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("")
+ public R getEquipTypeList(EquipType equipType){
+ String site = CommonMethods.getSite();
+ equipType.setSite( site );
+ List result;
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(equipType);
+ result = equipTypeService.list( queryWrapper );
+ return R.ok( result );
+ }
+
+ /**
+ * 通过设备检验设备类型是否存在
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("/equip")
+ public R getEquipTypeByEquip(Equip equip){
+ String site = CommonMethods.getSite();
+ String resource = equip.getResrce();
+ String resourceBo = HandleEnum.RESOURCE.getHandle(site,resource);
+
+ EquipTypeEquip equipTypeEquip = new EquipTypeEquip();
+ equipTypeEquip.setEquipBo( resourceBo );
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity( equipTypeEquip );
+ EquipTypeEquip _equipTypeEquip = equipTypeEquipService.getOne( queryWrapper );
+ if ( _equipTypeEquip == null ) {
+ return R.failed(null,"当前设备["+resource+"]未维护设备类型");
+ }
+ return R.ok( _equipTypeEquip);
+ }
+
+ /**
+ * 保存
+ */
+ @ResponseBody
+ @PostMapping("/save")
+ public R save(@RequestBody EquipType equipType) {
+ String site = CommonMethods.getSite();
+ String _handle = equipType.getHandle();
+ String equipTypeName = equipType.getEquipType();
+ String handle = HandleEnum.RESOURCE_TYPE.getHandle(site,equipTypeName);
+ equipType.setHandle( handle );
+ equipType.setSite( site );
+ equipType.setCreatedDateTime( new Date() );
+ equipType.setModifiedDateTime( new Date() );
+ //判断是更新还是新增 2020/12/01
+ EquipType et =equipTypeService.getById( handle );
+ if ( et != null && !et.getHandle().equals(_handle) ) {
+ throw BusinessException.build(equipTypeName+" 已存在，请先检索");
+ }
+ return R.ok( equipTypeService.saveOrUpdate(equipType),"保存成功" );
+ }
+
+ /**
+ * 删除
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("/remove/{equipType}")
+ public R removeById(@PathVariable("equipType") String equipType) {
+ String site = CommonMethods.getSite();
+ String handle = HandleEnum.RESOURCE_TYPE.getHandle(site,equipType);
+ //删除与设备的关系
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("EQUIP_TYPE_BO",handle );
+ equipTypeEquipService.remove( queryWrapper );
+ //删除设备类型
+ return R.ok( equipTypeService.removeById( handle ),"删除成功" );
+ }
+}
\ No newline at end of file
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/EmailGroupMapper.java b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/EmailGroupMapper.java
new file mode 100644
index 00000000..09f09ff2
--- /dev/null
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/EmailGroupMapper.java
@@ -0,0 +1,18 @@
+package com.foreverwin.mesnac.equip.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.foreverwin.mesnac.equip.model.EmailGroup;
+import org.springframework.stereotype.Repository;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author Max
+ * @since 2021-03-11
+ */
+@Repository
+public interface EmailGroupMapper extends BaseMapper {
+
+}
\ No newline at end of file
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/EquipMapper.java b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/EquipMapper.java
new file mode 100644
index 00000000..ffb8df9e
--- /dev/null
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/EquipMapper.java
@@ -0,0 +1,22 @@
+package com.foreverwin.mesnac.equip.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import com.foreverwin.mesnac.equip.model.Equip;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author Max
+ * @since 2020-10-10
+ */
+@Repository
+public interface EquipMapper extends BaseMapper {
+ List selectBySiteType(@Param("site") String site, @Param("type") String type);
+}
\ No newline at end of file
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/EquipTypeEquipMapper.java b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/EquipTypeEquipMapper.java
new file mode 100644
index 00000000..2eb28e2a
--- /dev/null
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/EquipTypeEquipMapper.java
@@ -0,0 +1,18 @@
+package com.foreverwin.mesnac.equip.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.foreverwin.mesnac.equip.model.EquipTypeEquip;
+import org.springframework.stereotype.Repository;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author Max
+ * @since 2020-10-10
+ */
+@Repository
+public interface EquipTypeEquipMapper extends BaseMapper {
+
+}
\ No newline at end of file
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/EquipTypeMapper.java b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/EquipTypeMapper.java
new file mode 100644
index 00000000..6a64ac66
--- /dev/null
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/EquipTypeMapper.java
@@ -0,0 +1,18 @@
+package com.foreverwin.mesnac.equip.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.foreverwin.mesnac.equip.model.EquipType;
+import org.springframework.stereotype.Repository;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author Max
+ * @since 2020-10-10
+ */
+@Repository
+public interface EquipTypeMapper extends BaseMapper {
+
+}
\ No newline at end of file
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/model/EmailGroup.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/EmailGroup.java
new file mode 100644
index 00000000..0fd792ff
--- /dev/null
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/EmailGroup.java
@@ -0,0 +1,123 @@
+package com.foreverwin.mesnac.equip.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;
+
+/**
+ *
+ *
+ *
+ *
+ * @author Max
+ * @since 2021-03-11
+ */
+
+@TableName("Z_EMAIL_GROUP")
+
+public class EmailGroup extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * EmailGroupBO:SITE,EMAIL_GROUP
+ */
+ @TableId(value = "HANDLE", type = IdType.INPUT)
+ private String handle;
+ /**
+ * 工厂
+ */
+ @TableField("SITE")
+ private String site;
+ /**
+ * 邮箱群组
+ */
+ @TableField("EMAIL_GROUP")
+ private String emailGroup;
+ /**
+ * 邮箱群组描述
+ */
+ @TableField("DESCRIPTION")
+ private String description;
+ /**
+ * 维护时间
+ */
+ @TableField("CREATED_DATE_TIME")
+ private LocalDateTime createdDateTime;
+ /**
+ * 维护人员
+ */
+ @TableField("CREATED_USER")
+ private String createdUser;
+
+
+ public String getHandle() {
+ return handle;
+ }
+
+ public void setHandle(String handle) {
+ this.handle = handle;
+ }
+
+ public String getSite() {
+ return site;
+ }
+
+ public void setSite(String site) {
+ this.site = site;
+ }
+
+ public String getEmailGroup() {
+ return emailGroup;
+ }
+
+ public void setEmailGroup(String emailGroup) {
+ this.emailGroup = emailGroup;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public LocalDateTime getCreatedDateTime() {
+ return createdDateTime;
+ }
+
+ public void setCreatedDateTime(LocalDateTime createdDateTime) {
+ this.createdDateTime = createdDateTime;
+ }
+
+ public String getCreatedUser() {
+ return createdUser;
+ }
+
+ public void setCreatedUser(String createdUser) {
+ this.createdUser = createdUser;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.handle;
+ }
+
+ @Override
+ public String toString() {
+ return "EmailGroup{" +
+ "handle = " + handle +
+ ", site = " + site +
+ ", emailGroup = " + emailGroup +
+ ", description = " + description +
+ ", createdDateTime = " + createdDateTime +
+ ", createdUser = " + createdUser +
+ "}";
+ }
+}
\ No newline at end of file
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/model/Equip.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/Equip.java
new file mode 100644
index 00000000..f3631774
--- /dev/null
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/Equip.java
@@ -0,0 +1,161 @@
+package com.foreverwin.mesnac.equip.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.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author Max
+ * @since 2020-10-10
+ */
+
+@TableName("RESRCE")
+
+public class Equip extends Model implements Comparable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "HANDLE", type = IdType.INPUT)
+ private String handle;
+ @TableField("SITE")
+ private String site;
+ @TableField("RESRCE")
+ private String resrce;
+ @TableField("DESCRIPTION")
+ private String description;
+ @TableField("STATUS_BO")
+ private String statusBo;
+ @TableField(exist = false)
+ private String equipType;
+ @TableField("CREATED_DATE_TIME")
+ private Date createdDateTime;
+ @TableField("MODIFIED_DATE_TIME")
+ private Date modifiedDateTime;
+ @TableField(exist = false)
+ private String status;
+ @TableField(exist = false)
+ private String department;
+ @TableField(exist = false)
+ private String serialNumber;
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getDepartment() {
+ return department;
+ }
+
+ public void setDepartment(String department) {
+ this.department = department;
+ }
+
+ public String getSerialNumber() {
+ return serialNumber;
+ }
+
+ public void setSerialNumber(String serialNumber) {
+ this.serialNumber = serialNumber;
+ }
+
+ public String getHandle() {
+ return handle;
+ }
+
+ public void setHandle(String handle) {
+ this.handle = handle;
+ }
+
+ public String getSite() {
+ return site;
+ }
+
+ public void setSite(String site) {
+ this.site = site;
+ }
+
+ public String getResrce() {
+ return resrce;
+ }
+
+ public void setResrce(String resrce) {
+ this.resrce = resrce;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getStatusBo() {
+ return statusBo;
+ }
+
+ public void setStatusBo(String statusBo) {
+ this.statusBo = statusBo;
+ }
+
+ public String getEquipType() {
+ return equipType;
+ }
+
+ public void setEquipType(String equipType) {
+ this.equipType = equipType;
+ }
+
+ public Date getCreatedDateTime() {
+ return createdDateTime;
+ }
+
+ public void setCreatedDateTime(Date createdDateTime) {
+ this.createdDateTime = createdDateTime;
+ }
+
+ public Date getModifiedDateTime() {
+ return modifiedDateTime;
+ }
+
+ public void setModifiedDateTime(Date modifiedDateTime) {
+ this.modifiedDateTime = modifiedDateTime;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.handle;
+ }
+
+ @Override
+ public String toString() {
+ return "Equip{" +
+ "handle = " + handle +
+ ", site = " + site +
+ ", resrce = " + resrce +
+ ", description = " + description +
+ ", statusBo = " + statusBo +
+ ", createdDateTime = " + createdDateTime +
+ ", modifiedDateTime = " + modifiedDateTime +
+ "}";
+ }
+
+ @Override
+ public int compareTo(Equip o) {
+ return this.getResrce().compareTo(o.getResrce());
+ }
+}
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/model/EquipType.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/EquipType.java
new file mode 100644
index 00000000..42754be1
--- /dev/null
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/EquipType.java
@@ -0,0 +1,106 @@
+package com.foreverwin.mesnac.equip.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.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author Max
+ * @since 2020-10-10
+ */
+
+@TableName("Z_PMS_EQUIP_TYPE")
+
+public class EquipType extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "HANDLE", type = IdType.INPUT)
+ private String handle;
+ @TableField("SITE")
+ private String site;
+ @TableField("EQUIP_TYPE")
+ private String equipType;
+ @TableField("DESCRIPTION")
+ private String description;
+ @TableField("CREATED_DATE_TIME")
+ private Date createdDateTime;
+ @TableField("MODIFIED_DATE_TIME")
+ private Date modifiedDateTime;
+
+
+ public String getHandle() {
+ return handle;
+ }
+
+ public void setHandle(String handle) {
+ this.handle = handle;
+ }
+
+ public String getSite() {
+ return site;
+ }
+
+ public void setSite(String site) {
+ this.site = site;
+ }
+
+ public String getEquipType() {
+ return equipType;
+ }
+
+ public void setEquipType(String equipType) {
+ this.equipType = equipType;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public Date getCreatedDateTime() {
+ return createdDateTime;
+ }
+
+ public void setCreatedDateTime(Date createdDateTime) {
+ this.createdDateTime = createdDateTime;
+ }
+
+ public Date getModifiedDateTime() {
+ return modifiedDateTime;
+ }
+
+ public void setModifiedDateTime(Date modifiedDateTime) {
+ this.modifiedDateTime = modifiedDateTime;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.handle;
+ }
+
+ @Override
+ public String toString() {
+ return "EquipType{" +
+ "handle = " + handle +
+ ", site = " + site +
+ ", equipType = " + equipType +
+ ", description = " + description +
+ ", createdDateTime = " + createdDateTime +
+ ", modifiedDateTime = " + modifiedDateTime +
+ "}";
+ }
+}
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/model/EquipTypeEquip.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/EquipTypeEquip.java
new file mode 100644
index 00000000..1a979ac4
--- /dev/null
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/EquipTypeEquip.java
@@ -0,0 +1,71 @@
+package com.foreverwin.mesnac.equip.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;
+
+/**
+ *
+ *
+ *
+ *
+ * @author Max
+ * @since 2020-10-10
+ */
+
+@TableName("Z_PMS_EQUIP_TYPE_EQUIP")
+
+public class EquipTypeEquip extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "HANDLE", type = IdType.INPUT)
+ private String handle;
+ @TableField("EQUIP_TYPE_BO")
+ private String equipTypeBo;
+ @TableField("EQUIP_BO")
+ private String equipBo;
+
+
+ public String getHandle() {
+ return handle;
+ }
+
+ public void setHandle(String handle) {
+ this.handle = handle;
+ }
+
+ public String getEquipTypeBo() {
+ return equipTypeBo;
+ }
+
+ public void setEquipTypeBo(String equipTypeBo) {
+ this.equipTypeBo = equipTypeBo;
+ }
+
+ public String getEquipBo() {
+ return equipBo;
+ }
+
+ public void setEquipBo(String equipBo) {
+ this.equipBo = equipBo;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.handle;
+ }
+
+ @Override
+ public String toString() {
+ return "EquipTypeEquip{" +
+ "handle = " + handle +
+ ", equipTypeBo = " + equipTypeBo +
+ ", equipBo = " + equipBo +
+ "}";
+ }
+}
\ No newline at end of file
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/EmailGroupService.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/EmailGroupService.java
new file mode 100644
index 00000000..d9743ebf
--- /dev/null
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/EmailGroupService.java
@@ -0,0 +1,28 @@
+package com.foreverwin.mesnac.equip.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.foreverwin.mesnac.equip.model.EmailGroup;
+import com.foreverwin.modular.core.util.FrontPage;
+
+import java.util.List;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author Max
+ * @since 2021-03-11
+ */
+public interface EmailGroupService extends IService {
+
+ /**
+ * 分页查询
+ * @param frontPage
+ * @return
+ */
+ IPage selectPage(FrontPage frontPage, EmailGroup emailGroup);
+
+ List selectList(EmailGroup emailGroup);
+}
\ No newline at end of file
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/EquipService.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/EquipService.java
new file mode 100644
index 00000000..7a1fb29b
--- /dev/null
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/EquipService.java
@@ -0,0 +1,30 @@
+package com.foreverwin.mesnac.equip.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.foreverwin.mesnac.equip.model.Equip;
+import com.foreverwin.modular.core.util.FrontPage;
+
+import java.util.List;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author Max
+ * @since 2020-10-10
+ */
+public interface EquipService extends IService {
+
+ /**
+ * 分页查询
+ * @param frontPage
+ * @return
+ */
+ IPage selectPage(FrontPage frontPage, Equip equip);
+
+ List selectList(Equip equip);
+
+ List selectBySiteType(String site, String type);
+}
\ No newline at end of file
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/EquipTypeEquipService.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/EquipTypeEquipService.java
new file mode 100644
index 00000000..a6753199
--- /dev/null
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/EquipTypeEquipService.java
@@ -0,0 +1,30 @@
+package com.foreverwin.mesnac.equip.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.foreverwin.mesnac.equip.model.EquipTypeEquip;
+import com.foreverwin.modular.core.util.FrontPage;
+
+import java.util.List;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author Max
+ * @since 2020-10-10
+ */
+public interface EquipTypeEquipService extends IService {
+
+ /**
+ * 分页查询
+ * @param frontPage
+ * @return
+ */
+ IPage selectPage(FrontPage frontPage, EquipTypeEquip equipTypeEquip);
+
+ List selectList(EquipTypeEquip equipTypeEquip);
+
+ String selectEquipTypeByEquip ( String site,String equip );
+}
\ No newline at end of file
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/EquipTypeService.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/EquipTypeService.java
new file mode 100644
index 00000000..47a0dfb0
--- /dev/null
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/EquipTypeService.java
@@ -0,0 +1,26 @@
+package com.foreverwin.mesnac.equip.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.foreverwin.mesnac.equip.model.EquipType;
+import com.foreverwin.modular.core.util.FrontPage;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author Max
+ * @since 2020-10-10
+ */
+public interface EquipTypeService extends IService {
+
+ /**
+ * 分页查询
+ * @param frontPage
+ * @return
+ */
+ IPage selectPage(FrontPage frontPage, EquipType equipType);
+
+ //List selectList(EquipType equipType);
+}
\ No newline at end of file
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EmailGroupServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EmailGroupServiceImpl.java
new file mode 100644
index 00000000..58ba6b9e
--- /dev/null
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EmailGroupServiceImpl.java
@@ -0,0 +1,48 @@
+package com.foreverwin.mesnac.equip.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.foreverwin.mesnac.equip.mapper.EmailGroupMapper;
+import com.foreverwin.mesnac.equip.model.EmailGroup;
+import com.foreverwin.mesnac.equip.service.EmailGroupService;
+import com.foreverwin.modular.core.util.FrontPage;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author Max
+ * @since 2021-03-11
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class EmailGroupServiceImpl extends ServiceImpl implements EmailGroupService {
+
+
+ @Autowired
+ private EmailGroupMapper emailGroupMapper;
+
+ @Override
+ public IPage selectPage(FrontPage frontPage, EmailGroup emailGroup) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(emailGroup);
+ return super.page(frontPage.getPagePlus(), queryWrapper);
+ }
+
+ @Override
+ public List selectList(EmailGroup emailGroup) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(emailGroup);
+ return super.list(queryWrapper);
+ }
+
+
+}
\ No newline at end of file
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EquipServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EquipServiceImpl.java
new file mode 100644
index 00000000..84848d1e
--- /dev/null
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EquipServiceImpl.java
@@ -0,0 +1,50 @@
+package com.foreverwin.mesnac.equip.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.foreverwin.mesnac.equip.mapper.EquipMapper;
+import com.foreverwin.mesnac.equip.model.Equip;
+import com.foreverwin.mesnac.equip.service.EquipService;
+import com.foreverwin.modular.core.util.FrontPage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author Max
+ * @since 2020-10-10
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class EquipServiceImpl extends ServiceImpl implements EquipService {
+
+
+ @Autowired
+ private EquipMapper equipMapper;
+
+ @Override
+ public IPage selectPage(FrontPage frontPage, Equip equip) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(equip);
+ return super.page(frontPage.getPagePlus(), queryWrapper);
+ }
+
+ @Override
+ public List selectList(Equip equip) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(equip);
+ return super.list(queryWrapper);
+ }
+
+ @Override
+ public List selectBySiteType(String site, String type) {
+ return baseMapper.selectBySiteType(site, type);
+ }
+}
\ No newline at end of file
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EquipTypeEquipServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EquipTypeEquipServiceImpl.java
new file mode 100644
index 00000000..954819c5
--- /dev/null
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EquipTypeEquipServiceImpl.java
@@ -0,0 +1,69 @@
+package com.foreverwin.mesnac.equip.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.foreverwin.mesnac.common.enums.HandleEnum;
+import com.foreverwin.mesnac.common.util.StringUtil;
+import com.foreverwin.mesnac.equip.mapper.EquipTypeEquipMapper;
+import com.foreverwin.mesnac.equip.model.EquipTypeEquip;
+import com.foreverwin.mesnac.equip.service.EquipTypeEquipService;
+import com.foreverwin.mesnac.equip.util.ConstantUtil;
+import com.foreverwin.modular.core.util.FrontPage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author Max
+ * @since 2020-10-10
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class EquipTypeEquipServiceImpl extends ServiceImpl implements EquipTypeEquipService {
+
+
+ @Autowired
+ private EquipTypeEquipMapper equipTypeEquipMapper;
+
+ @Override
+ public IPage selectPage(FrontPage frontPage, EquipTypeEquip equipTypeEquip) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(equipTypeEquip);
+ return super.page(frontPage.getPagePlus(), queryWrapper);
+ }
+
+ @Override
+ public List selectList(EquipTypeEquip equipTypeEquip) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(equipTypeEquip);
+ return super.list(queryWrapper);
+ }
+
+ @Override
+ public String selectEquipTypeByEquip( String site,String equip ) {
+ //
+ String equipBo = HandleEnum.RESOURCE+site+","+equip;
+ String equipType = "";
+ EquipTypeEquip equipTypeEquip = new EquipTypeEquip();
+ equipTypeEquip.setEquipBo( equipBo );
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity( equipTypeEquip );
+ equipTypeEquip = super.getOne( queryWrapper );
+ if ( equipTypeEquip == null ) {
+ return null;
+ }
+ if ( StringUtil.notEmpty( equipTypeEquip.getEquipTypeBo() ) ) {
+ equipType = equipTypeEquip.getEquipTypeBo().split(",")[1];
+ }
+ return equipType;
+ }
+
+
+}
\ No newline at end of file
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EquipTypeServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EquipTypeServiceImpl.java
new file mode 100644
index 00000000..36962cfa
--- /dev/null
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EquipTypeServiceImpl.java
@@ -0,0 +1,45 @@
+package com.foreverwin.mesnac.equip.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.foreverwin.mesnac.equip.mapper.EquipTypeMapper;
+import com.foreverwin.mesnac.equip.model.EquipType;
+import com.foreverwin.mesnac.equip.service.EquipTypeService;
+import com.foreverwin.modular.core.util.FrontPage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author Max
+ * @since 2020-10-10
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class EquipTypeServiceImpl extends ServiceImpl implements EquipTypeService {
+
+
+ @Autowired
+ private EquipTypeMapper equipTypeMapper;
+
+ @Override
+ public IPage selectPage(FrontPage frontPage, EquipType equipType) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(equipType);
+ return super.page(frontPage.getPagePlus(), queryWrapper);
+ }
+
+ /*@Override
+ public List selectList(EquipType equipType) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(equipType);
+ return super.list(queryWrapper);
+ }*/
+
+
+}
\ No newline at end of file
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/util/ConstantUtil.java b/equip/src/main/java/com/foreverwin/mesnac/equip/util/ConstantUtil.java
new file mode 100644
index 00000000..aaffb757
--- /dev/null
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/util/ConstantUtil.java
@@ -0,0 +1,100 @@
+package com.foreverwin.mesnac.equip.util;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class ConstantUtil {
+
+ public static final String KEYWORD_TRUE = "TRUE";
+ public static final String KEYWORD_FALSE = "FALSE";
+
+ public static final String ATTACHED_EQUIP = "1";
+ public static final String ATTACHED_EQUIP_TYPE = "2"
+ ;
+ public static final String MAINTAIN_PLAN_UNIT_1 = "1";
+ public static final String MAINTAIN_PLAN_UNIT_2 = "2";
+ public static final String MAINTAIN_PLAN_UNIT_3 = "3";
+ public static final String MAINTAIN_PLAN_UNIT_4 = "4";
+ public static final String MAINTAIN_PLAN_UNIT_5 = "5";
+
+ public static final String ACTION_NAME_CYCLE = "1";
+ public static final String ACTION_NAME_INTERVAL = "2";
+
+ public static final String LIST_TYPE_INSPECT = "I";
+ public static final String LIST_TYPE_MAINTAIN = "M";
+
+ public static final String TOOL_MAINTAIN_LIST_RESULT_TYPE_BOOL = "1";
+ public static final String TOOL_MAINTAIN_LIST_RESULT_TYPE_TEXT = "2";
+ public static final String TOOL_MAINTAIN_LIST_RESULT_TYPE_NUMBER = "3";
+
+ public static final Integer EXT_POSITION_1 = 1;
+ public static final Integer EXT_POSITION_2 = 2;
+ public static final Integer EXT_POSITION_3 = 3;
+
+ public static final String STATUS_ENABLED = "301";
+ public static final String STATUS_DISABLED = "302";
+ public static final String STATUS_NEW = "401";
+ public static final String STATUS_IN_QUEUE = "402";
+
+ public static final String TASK_STATUS_1 = "1";
+ public static final String TASK_STATUS_2 = "2";
+ public static final String TASK_STATUS_3 = "3";
+ public static final String TASK_STATUS_4 = "4";
+
+ public static final String REPAIR_STATUS_1 = "1";
+ public static final String REPAIR_STATUS_2 = "2";
+ public static final String REPAIR_STATUS_3 = "3";
+ public static final String REPAIR_STATUS_4 = "4";
+ public static final String REPAIR_STATUS_5 = "5";
+ public static final String REPAIR_STATUS_6 = "6";
+ public static final String REPAIR_STATUS_7 = "7";
+ public static final String REPAIR_STATUS_8 = "8";
+
+ public static final String MAINTAIN_TASK_TYPE_1 = "1";
+ public static final String MAINTAIN_TASK_TYPE_2 = "2";
+ public static final String MAINTAIN_TASK_TYPE_3 = "3";
+ public static final String MAINTAIN_TASK_TYPE_4 = "4";
+
+ public static final Map MAINTAIN_PLAN_UNITS = new LinkedHashMap();
+ public static final Map TASK_STATUSES = new LinkedHashMap();
+ public static final Map TOOL_MAINTAIN_LIST_RESULT_TYPES = new LinkedHashMap();
+ public static final Map REPAIR_STATUS = new LinkedHashMap();
+ public static final Map MAINTAIN_TASK_TYPE = new LinkedHashMap();
+ public static final Map PLAN_STATUS = new LinkedHashMap();
+
+ static {
+ //----------------------------------------------------------------------------------------------------------------------------------
+ MAINTAIN_PLAN_UNITS.put(MAINTAIN_PLAN_UNIT_1, "小时");
+ MAINTAIN_PLAN_UNITS.put(MAINTAIN_PLAN_UNIT_2, "日");
+ MAINTAIN_PLAN_UNITS.put(MAINTAIN_PLAN_UNIT_3, "周");
+ MAINTAIN_PLAN_UNITS.put(MAINTAIN_PLAN_UNIT_4, "月");
+ MAINTAIN_PLAN_UNITS.put(MAINTAIN_PLAN_UNIT_5, "年");
+ //----------------------------------------------------------------------------------------------------------------------------------
+ TASK_STATUSES.put(TASK_STATUS_1, "未开始");
+ TASK_STATUSES.put(TASK_STATUS_2, "进行中");
+ TASK_STATUSES.put(TASK_STATUS_3, "关闭");
+ TASK_STATUSES.put(TASK_STATUS_4, "完成");
+ //----------------------------------------------------------------------------------------------------------------------------------
+ TOOL_MAINTAIN_LIST_RESULT_TYPES.put(TOOL_MAINTAIN_LIST_RESULT_TYPE_BOOL, "布尔值");
+ TOOL_MAINTAIN_LIST_RESULT_TYPES.put(TOOL_MAINTAIN_LIST_RESULT_TYPE_TEXT, "文本");
+ TOOL_MAINTAIN_LIST_RESULT_TYPES.put(TOOL_MAINTAIN_LIST_RESULT_TYPE_NUMBER, "数字");
+ //----------------------------------------------------------------------------------------------------------------
+ REPAIR_STATUS.put(REPAIR_STATUS_1,"新建");
+ REPAIR_STATUS.put(REPAIR_STATUS_2,"已报修");
+ REPAIR_STATUS.put(REPAIR_STATUS_3,"维修中");
+ REPAIR_STATUS.put(REPAIR_STATUS_4,"维修完成");
+ REPAIR_STATUS.put(REPAIR_STATUS_5,"待生产确认");
+ REPAIR_STATUS.put(REPAIR_STATUS_6,"待品质确认");
+ REPAIR_STATUS.put(REPAIR_STATUS_7,"确认完成");
+ REPAIR_STATUS.put(REPAIR_STATUS_8,"关闭");//取消或者重修的任务状态
+ //-------------------------------------------------------------------------------------------------------------------
+ MAINTAIN_TASK_TYPE.put(MAINTAIN_TASK_TYPE_1,"周保养");
+ MAINTAIN_TASK_TYPE.put(MAINTAIN_TASK_TYPE_2,"月保养");
+ MAINTAIN_TASK_TYPE.put(MAINTAIN_TASK_TYPE_3,"季保养");
+ MAINTAIN_TASK_TYPE.put(MAINTAIN_TASK_TYPE_4,"年保养");
+ //-------------------------------------------------------------------------------------------------------------------
+ PLAN_STATUS.put( STATUS_ENABLED,"启动" );
+ PLAN_STATUS.put( STATUS_DISABLED,"禁止" );
+ PLAN_STATUS.put( STATUS_NEW,"新建" );
+ }
+}
diff --git a/equip/src/main/resources/mapper/EquipMapper.xml b/equip/src/main/resources/mapper/EquipMapper.xml
new file mode 100644
index 00000000..6ea4284d
--- /dev/null
+++ b/equip/src/main/resources/mapper/EquipMapper.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/equip/src/main/resources/mapper/EquipTypeMapper.xml b/equip/src/main/resources/mapper/EquipTypeMapper.xml
deleted file mode 100644
index e69de29b..00000000
diff --git a/meapi/pom.xml b/meapi/pom.xml
index 26b3076f..a3034421 100644
--- a/meapi/pom.xml
+++ b/meapi/pom.xml
@@ -28,5 +28,10 @@
com.foreverwin.modular
modular-melib
+
+
+ com.foreverwin.mesnac
+ common
+
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/CustomFieldsController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/CustomFieldsController.java
new file mode 100644
index 00000000..9f7bf116
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/CustomFieldsController.java
@@ -0,0 +1,120 @@
+package com.foreverwin.mesnac.meapi.controller;
+
+import com.foreverwin.modular.core.util.R;
+import com.foreverwin.modular.core.util.FrontPage;
+import com.foreverwin.modular.core.util.CommonMethods;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.foreverwin.mesnac.meapi.service.CustomFieldsService;
+import com.foreverwin.mesnac.meapi.model.CustomFields;
+import java.util.List;
+
+/**
+ *
+ * @author LZP
+ * @since 2021-06-01
+ */
+@RestController
+@RequestMapping("/CUSTOM-FIELDS")
+public class CustomFieldsController {
+
+ @Autowired
+ public CustomFieldsService customFieldsService;
+
+ /**
+ * 根据id查询
+ *
+ * @param id 主键
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("/{id:.+}")
+ public R getCustomFieldsById(@PathVariable String id) {
+ return R.ok( customFieldsService.getById(id));
+ }
+
+ /**
+ * 查询所有数据
+ *
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("")
+ public R getCustomFieldsList(CustomFields customFields){
+ List result;
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(customFields);
+ result = customFieldsService.list(queryWrapper);
+ return R.ok(result);
+ }
+
+ /**
+ * 分页查询数据
+ *
+ * @param frontPage 分页信息
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("/page")
+ public R page(FrontPage frontPage, CustomFields customFields){
+ IPage result;
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(customFields);
+ if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
+ //TODO modify global query
+ queryWrapper.lambda().and(wrapper -> wrapper
+ .like(CustomFields::getHandle, frontPage.getGlobalQuery())
+ .or().like(CustomFields::getAttribute, frontPage.getGlobalQuery())
+ .or().like(CustomFields::getValue, frontPage.getGlobalQuery())
+ );
+ }
+ result = customFieldsService.page(frontPage.getPagePlus(), queryWrapper);
+ return R.ok(result);
+ }
+
+ /**
+ * 新增
+ * @param customFields 传递的实体
+ * @return null 失败 实体成功
+ */
+ @PostMapping
+ public R save(@RequestBody CustomFields customFields) {
+ return R.ok(customFieldsService.save(customFields));
+ }
+
+ /**
+ * 修改
+ * @param customFields 传递的实体
+ * @return null 失败 实体成功
+ */
+ @PutMapping
+ public R updateById(@RequestBody CustomFields customFields) {
+ return R.ok(customFieldsService.updateById(customFields));
+ }
+
+ /**
+ * 根据id删除对象
+ * @param id 实体ID
+ * @return 0 失败 1 成功
+ */
+ @ResponseBody
+ @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}")
+ public R removeById(@PathVariable("id") String id){
+ return R.ok(customFieldsService.removeById(id));
+ }
+
+ /**
+ * 批量删除对象
+ * @param ids 实体集合ID
+ * @return 0 失败 1 成功
+ */
+ @ResponseBody
+ @RequestMapping(method = RequestMethod.POST, value = "/delete-batch")
+ public R removeByIds(List ids){
+ return R.ok(customFieldsService.removeByIds(ids));
+ }
+}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java
index a624fdcd..d926d80d 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java
@@ -2,7 +2,6 @@ package com.foreverwin.mesnac.meapi.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.foreverwin.mesnac.meapi.util.StringUtils;
import com.foreverwin.mesnac.meapi.model.Item;
import com.foreverwin.mesnac.meapi.service.ItemService;
import com.foreverwin.modular.core.util.CommonMethods;
@@ -24,18 +23,6 @@ public class ItemController {
@Autowired
public ItemService itemService;
- /**
- * 根据id查询
- *
- * @param id 主键
- * @return
- */
- @ResponseBody
- @GetMapping("/{id:.+}")
- public R getItemById(@PathVariable String id) {
- return R.ok(itemService.getById(id));
- }
-
/**
* 查询所有数据
*
@@ -51,86 +38,33 @@ public class ItemController {
return R.ok(result);
}
- /**
- * 查询所有数据-张漪雯
- *
- * @return
- */
- @ResponseBody
- @GetMapping("/item-select")
- public R getItemselect(Item item) {
- List- result;
- QueryWrapper
- queryWrapper = new QueryWrapper<>();
- queryWrapper.setEntity(item);
- result = itemService.selectList(queryWrapper);
- return R.ok(result);
- }
-
-
/**
* 分页查询数据
*
- * @param frontPage 分页信息
+ * @param frontPage 分页信息
* @return
*/
@ResponseBody
- @GetMapping("/page")
- public R page(FrontPage
- frontPage, Item item) {
+ @GetMapping("/getItemPageList")
+ public R getItemPageList(FrontPage
- frontPage, Item item){
IPage result;
- QueryWrapper
- queryWrapper = new QueryWrapper<>();
- queryWrapper.setEntity(item);
- if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
- //TODO modify global query
- queryWrapper.lambda().and(wrapper -> wrapper
- .like(Item::getHandle, frontPage.getGlobalQuery())
- .or().like(Item::getSite, frontPage.getGlobalQuery())
- .or().like(Item::getItem, frontPage.getGlobalQuery())
- .or().like(Item::getStatusBo, frontPage.getGlobalQuery())
- .or().like(Item::getItemType, frontPage.getGlobalQuery())
- .or().like(Item::getErpGtin, frontPage.getGlobalQuery())
- .or().like(Item::getAinModelExternalId, frontPage.getGlobalQuery())
- .or().like(Item::getQuantityRestriction, frontPage.getGlobalQuery())
- .or().like(Item::getRouterBo, frontPage.getGlobalQuery())
- .or().like(Item::getBomBo, frontPage.getGlobalQuery())
- .or().like(Item::getComponentGroupBo, frontPage.getGlobalQuery())
- .or().like(Item::getItemGroupBo, frontPage.getGlobalQuery())
- .or().like(Item::getAssyDataTypeBo, frontPage.getGlobalQuery())
- .or().like(Item::getPreAssembled, frontPage.getGlobalQuery())
- .or().like(Item::getRevision, frontPage.getGlobalQuery())
- .or().like(Item::getCurrentRevision, frontPage.getGlobalQuery())
- .or().like(Item::getSelectorActivityBo, frontPage.getGlobalQuery())
- .or().like(Item::getSelectorNote, frontPage.getGlobalQuery())
- .or().like(Item::getAssignSerialAtRelease, frontPage.getGlobalQuery())
- .or().like(Item::getDrawingName, frontPage.getGlobalQuery())
- .or().like(Item::getUseCompFromDrawing, frontPage.getGlobalQuery())
- .or().like(Item::getPanel, frontPage.getGlobalQuery())
- .or().like(Item::getRemovalAssyDataTypeBo, frontPage.getGlobalQuery())
- .or().like(Item::getInvAssyDataTypeBo, frontPage.getGlobalQuery())
- .or().like(Item::getOriginalStatusBo, frontPage.getGlobalQuery())
- .or().like(Item::getCreateTrackableSfc, frontPage.getGlobalQuery())
- .or().like(Item::getMaskGroupBo, frontPage.getGlobalQuery())
- .or().like(Item::getTransferItemGroupBo, frontPage.getGlobalQuery())
- .or().like(Item::getUnitOfMeasure, frontPage.getGlobalQuery())
- .or().like(Item::getCollectParentSerial, frontPage.getGlobalQuery())
- .or().like(Item::getReqSerialChange, frontPage.getGlobalQuery())
- .or().like(Item::getIsCollector, frontPage.getGlobalQuery())
- .or().like(Item::getIncBatchNumber, frontPage.getGlobalQuery())
- .or().like(Item::getTimeSensitive, frontPage.getGlobalQuery())
- .or().like(Item::getMaxShelfLifeUnits, frontPage.getGlobalQuery())
- .or().like(Item::getMaxFloorLifeUnits, frontPage.getGlobalQuery())
- .or().like(Item::getNotes, frontPage.getGlobalQuery())
- .or().like(Item::getTbCompType, frontPage.getGlobalQuery())
- .or().like(Item::getErpBackflushing, frontPage.getGlobalQuery())
- .or().like(Item::getStorageLocationBo, frontPage.getGlobalQuery())
- .or().like(Item::getErpPutawayStorloc, frontPage.getGlobalQuery())
- .or().like(Item::getProductionSupplyArea, frontPage.getGlobalQuery())
- .or().like(Item::getUseOrderIdRel1, frontPage.getGlobalQuery())
- .or().like(Item::getMaterialType, frontPage.getGlobalQuery())
- .or().like(Item::getProcurementType, frontPage.getGlobalQuery())
- .or().like(Item::getOrigin, frontPage.getGlobalQuery())
- );
+ try {
+ String site = CommonMethods.getSite();
+
+ item.setSite(site);
+ QueryWrapper
- queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(item);
+ if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
+ queryWrapper
+ .like(Item.ITEM, frontPage.getGlobalQuery())
+ .or().like("DESCRIPTION", frontPage.getGlobalQuery())
+ .or().like(Item.STATUS_BO, frontPage.getGlobalQuery())
+ .or().like(Item.ITEM_TYPE, frontPage.getGlobalQuery());
+ }
+ result = itemService.selectPage(frontPage.getPagePlus(), queryWrapper);
+ } catch (Exception e) {
+ return R.failed(e.getMessage());
}
- result = itemService.page(frontPage.getPagePlus(), queryWrapper);
return R.ok(result);
}
@@ -156,66 +90,4 @@ public class ItemController {
return R.ok(itemService.updateById(item));
}
- /**
- * 根据id删除对象
- *
- * @param id 实体ID
- * @return 0 失败 1 成功
- */
- @ResponseBody
- @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}")
- public R removeById(@PathVariable("id") String id) {
- return R.ok(itemService.removeById(id));
- }
-
- /**
- * 批量删除对象
- *
- * @param ids 实体集合ID
- * @return 0 失败 1 成功
- */
- @ResponseBody
- @RequestMapping(method = RequestMethod.POST, value = "/delete-batch")
- public R removeByIds(List ids) {
- return R.ok(itemService.removeByIds(ids));
- }
-
- /**
- * 新增
- *
- * @param item 传递的实体
- * @return null 失败 实体成功
- */
- @GetMapping("/selectItemByDesc")
- public R selectItemByDesc(Item item) {
- try {
- return R.ok(itemService.selectItemWithDesc(item));
- } catch (Exception e) {
- return R.failed(e.getMessage());
- }
- }
-
-
- @GetMapping("/getItemDetailList")
- public R getItemDetailList() {
- return R.ok(itemService.getItemDetailList());
-
- }
-
- @GetMapping("/getBklasItem")
- public R getBklasItem(FrontPage
- frontPage) {
- return R.ok(itemService.getBklasItem(frontPage.getPagePlus(), frontPage.getGlobalQuery()));
-
- }
-
-
-
- @ResponseBody
- @GetMapping("/getRawMaterial")
- public R getRawMaterial(FrontPage frontPage) {
- String global = frontPage.getGlobalQuery();
- return R.ok(itemService.getRawMaterial(frontPage.getPagePlus(), global));
-
- }
-
}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java
index 881ee61c..e7aa4acf 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java
@@ -62,31 +62,29 @@ public class ResrceController {
@GetMapping("/page")
public R page(FrontPage frontPage, Resrce resrce){
IPage result;
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.setEntity(resrce);
- if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
- //TODO modify global query
- queryWrapper.lambda().and(wrapper -> wrapper
- .like(Resrce::getHandle, frontPage.getGlobalQuery())
- .or().like(Resrce::getSite, frontPage.getGlobalQuery())
- .or().like(Resrce::getResrce, frontPage.getGlobalQuery())
- .or().like(Resrce::getDescription, frontPage.getGlobalQuery())
- .or().like(Resrce::getStatusBo, frontPage.getGlobalQuery())
- .or().like(Resrce::getProcessResource, frontPage.getGlobalQuery())
- .or().like(Resrce::getOperationBo, frontPage.getGlobalQuery())
- .or().like(Resrce::getSetupState, frontPage.getGlobalQuery())
- .or().like(Resrce::getSetupDescription, frontPage.getGlobalQuery())
- .or().like(Resrce::getCncMachine, frontPage.getGlobalQuery())
- .or().like(Resrce::getPendingStatusBo, frontPage.getGlobalQuery())
- .or().like(Resrce::getPendingReasonCodeBo, frontPage.getGlobalQuery())
- .or().like(Resrce::getPendingResourceRcBo, frontPage.getGlobalQuery())
- .or().like(Resrce::getPendingComments, frontPage.getGlobalQuery())
- .or().like(Resrce::getErpPlantMaintOrder, frontPage.getGlobalQuery())
- .or().like(Resrce::getErpEquipmentNumber, frontPage.getGlobalQuery())
- .or().like(Resrce::getErpCapacityCategory, frontPage.getGlobalQuery())
- );
+ try {
+ String site = CommonMethods.getSite();
+ resrce.setSite(site);
+
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(resrce);
+ if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
+ queryWrapper
+ .like(Resrce.HANDLE, frontPage.getGlobalQuery())
+ .or().like(Resrce.SITE, frontPage.getGlobalQuery())
+ .or().like(Resrce.RESRCE, frontPage.getGlobalQuery())
+ .or().like(Resrce.DESCRIPTION, frontPage.getGlobalQuery())
+ .or().like(Resrce.STATUS_BO, frontPage.getGlobalQuery())
+ .or().like(Resrce.PROCESS_RESOURCE, frontPage.getGlobalQuery())
+ .or().like(Resrce.OPERATION_BO, frontPage.getGlobalQuery())
+ .or().like(Resrce.SETUP_STATE, frontPage.getGlobalQuery())
+ .or().like(Resrce.SETUP_DESCRIPTION, frontPage.getGlobalQuery())
+ .or().like(Resrce.CNC_MACHINE, frontPage.getGlobalQuery());
+ }
+ result = resrceService.page(frontPage.getPagePlus(), queryWrapper);
+ } catch (Exception e) {
+ return R.failed(e.getMessage());
}
- result = resrceService.page(frontPage.getPagePlus(), queryWrapper);
return R.ok(result);
}
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java
new file mode 100644
index 00000000..69e331ec
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java
@@ -0,0 +1,70 @@
+package com.foreverwin.mesnac.meapi.controller;
+
+import com.foreverwin.mesnac.common.enums.HandleEnum;
+import com.foreverwin.modular.core.util.R;
+import com.foreverwin.modular.core.util.FrontPage;
+import com.foreverwin.modular.core.util.CommonMethods;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.foreverwin.mesnac.meapi.service.ShopOrderService;
+import com.foreverwin.mesnac.meapi.model.ShopOrder;
+
+/**
+ *
+ * @author Leon.L
+ * @since 2021-06-01
+ */
+@RestController
+@RequestMapping("/SHOP-ORDER")
+public class ShopOrderController {
+
+ @Autowired
+ public ShopOrderService shopOrderService;
+
+ /**
+ * 分页查询数据
+ *
+ * @param frontPage 分页信息
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("/getShopOrderPageList")
+ public R getShopOrderPageList(FrontPage frontPage, ShopOrder shopOrder){
+ IPage result;
+ try {
+ String site = CommonMethods.getSite();
+ //只查询 可下达 状态的
+ String status501Bo = HandleEnum.STATUS.getHandle(site, "501");
+
+ shopOrder.setSite(site);
+ shopOrder.setStatusBo(status501Bo);
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(shopOrder);
+ if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
+ queryWrapper
+ .like(ShopOrder.SHOP_ORDER, frontPage.getGlobalQuery())
+ .or().like(ShopOrder.STATUS_BO, frontPage.getGlobalQuery())
+ .or().like(ShopOrder.SHOP_ORDER_TYPE_BO, frontPage.getGlobalQuery())
+ .or().like(ShopOrder.PLANNED_WORK_CENTER_BO, frontPage.getGlobalQuery())
+ .or().like(ShopOrder.PLANNED_ITEM_BO, frontPage.getGlobalQuery())
+ .or().like(ShopOrder.PLANNED_BOM_BO, frontPage.getGlobalQuery())
+ .or().like(ShopOrder.PLANNED_ROUTER_BO, frontPage.getGlobalQuery())
+ .or().like(ShopOrder.ITEM_BO, frontPage.getGlobalQuery())
+ .or().like(ShopOrder.BOM_BO, frontPage.getGlobalQuery())
+ .or().like(ShopOrder.ROUTER_BO, frontPage.getGlobalQuery())
+ .or().like(ShopOrder.QTY_TO_BUILD, frontPage.getGlobalQuery())
+ .or().like(ShopOrder.CUSTOMER, frontPage.getGlobalQuery())
+ .or().like(ShopOrder.CUSTOMER_ORDER, frontPage.getGlobalQuery());
+ }
+ result = shopOrderService.page(frontPage.getPagePlus(), queryWrapper);
+ } catch (Exception e) {
+ return R.failed(e.getMessage());
+ }
+
+ return R.ok(result);
+ }
+}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java
index 442824fa..56e88c2c 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.foreverwin.mesnac.meapi.model.WorkCenter;
import com.foreverwin.mesnac.meapi.service.WorkCenterService;
+import com.foreverwin.modular.core.util.CommonMethods;
import com.foreverwin.modular.core.util.FrontPage;
import com.foreverwin.modular.core.util.R;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,17 +24,6 @@ public class WorkCenterController {
@Autowired
public WorkCenterService workCenterService;
- /**
- * 根据id查询
- *
- * @param id 主键
- * @return
- */
- @ResponseBody
- @GetMapping("/{id:.+}")
- public R getWorkCenterById(@PathVariable String id) {
- return R.ok( workCenterService.getById(id));
- }
/**
* 查询所有数据
@@ -60,28 +50,28 @@ public class WorkCenterController {
@GetMapping("/page")
public R page(FrontPage frontPage, WorkCenter workCenter){
IPage result;
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.setEntity(workCenter);
- if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
- //TODO modify global query
- queryWrapper.lambda().and(wrapper -> wrapper
- .like(WorkCenter::getHandle, frontPage.getGlobalQuery())
- .or().like(WorkCenter::getSite, frontPage.getGlobalQuery())
- .or().like(WorkCenter::getWorkCenter, frontPage.getGlobalQuery())
- .or().like(WorkCenter::getRouterBo, frontPage.getGlobalQuery())
- .or().like(WorkCenter::getCanBeReleasedTo, frontPage.getGlobalQuery())
- .or().like(WorkCenter::getWcCategory, frontPage.getGlobalQuery())
- .or().like(WorkCenter::getStatusBo, frontPage.getGlobalQuery())
- .or().like(WorkCenter::getWcType, frontPage.getGlobalQuery())
- .or().like(WorkCenter::getAssignmentEnforcement, frontPage.getGlobalQuery())
- .or().like(WorkCenter::getIsErpWorkCenter, frontPage.getGlobalQuery())
- .or().like(WorkCenter::getErpWorkCenter, frontPage.getGlobalQuery())
- .or().like(WorkCenter::getErpCapacityCategory, frontPage.getGlobalQuery())
- .or().like(WorkCenter::getProductionSupplyArea, frontPage.getGlobalQuery())
- .or().like(WorkCenter::getStandardValueKeyBo, frontPage.getGlobalQuery())
- );
+ try {
+ String site = CommonMethods.getSite();
+
+ workCenter.setSite(site);
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(workCenter);
+ if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
+ queryWrapper
+ .like(WorkCenter.HANDLE, frontPage.getGlobalQuery())
+ .or().like(WorkCenter.SITE, frontPage.getGlobalQuery())
+ .or().like(WorkCenter.WORK_CENTER, frontPage.getGlobalQuery())
+ .or().like(WorkCenter.ROUTER_BO, frontPage.getGlobalQuery())
+ .or().like(WorkCenter.CAN_BE_RELEASED_TO, frontPage.getGlobalQuery())
+ .or().like(WorkCenter.WC_CATEGORY, frontPage.getGlobalQuery())
+ .or().like(WorkCenter.STATUS_BO, frontPage.getGlobalQuery())
+ .or().like(WorkCenter.WC_TYPE, frontPage.getGlobalQuery());
+ }
+ result = workCenterService.page(frontPage.getPagePlus(), queryWrapper);
+ } catch (Exception e) {
+ return R.failed(e.getMessage());
}
- result = workCenterService.page(frontPage.getPagePlus(), queryWrapper);
+
return R.ok(result);
}
@@ -104,39 +94,4 @@ public class WorkCenterController {
public R updateById(@RequestBody WorkCenter workCenter) {
return R.ok(workCenterService.updateById(workCenter));
}
-
- /**
- * 根据id删除对象
- * @param id 实体ID
- * @return 0 失败 1 成功
- */
- @ResponseBody
- @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}")
- public R removeById(@PathVariable("id") String id){
- return R.ok(workCenterService.removeById(id));
- }
-
- /**
- * 批量删除对象
- * @param ids 实体集合ID
- * @return 0 失败 1 成功
- */
- @ResponseBody
- @RequestMapping(method = RequestMethod.POST, value = "/delete-batch")
- public R removeByIds(List ids){
- return R.ok(workCenterService.removeByIds(ids));
- }
-
- /**
- * 查询工作中心和工作中心描述
- * @param frontPage
- * @return
- */
- @ResponseBody
- @GetMapping("/SelectWorkCenter")
- public R getWorkCenterWcList(FrontPage frontPage){
- List result;
- String workCenter=frontPage.getGlobalQuery();
- return R.ok(workCenterService.workCenterlist(frontPage.getPagePlus(),workCenter));
- }
}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/CustomFieldsMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/CustomFieldsMapper.java
new file mode 100644
index 00000000..602140a8
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/CustomFieldsMapper.java
@@ -0,0 +1,45 @@
+package com.foreverwin.mesnac.meapi.mapper;
+
+import com.foreverwin.mesnac.meapi.model.CustomFields;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author LZP
+ * @since 2021-06-01
+ */
+@Repository
+public interface CustomFieldsMapper extends BaseMapper {
+
+ String selectCustomFieldsValue(@Param("handle") String handle,
+ @Param("attribute") String attribute);
+
+ List selectCustomFieldsByHandle(@Param("handle") String handle);
+
+ List selectCustomFields(@Param("handle") String handle,
+ @Param("attribute") String attribute);
+
+ List> selectEquipType(@Param("site") String site,
+ @Param("equipType") String equipType);
+ Map getCustom(@Param("handle") String handle, @Param("attr") String attr);
+ List> getCustoms(@Param("handles") List handles, @Param("attr") String attr);
+
+ Map selectItemGroupPrintTemplate(@Param("sfcBo") String sfcBo);
+ Map selectItemGroupPrintTemplateByItemBo(@Param("itemBo") String itemBo);
+
+ void setCustom(@Param("handle") String handle, @Param("attribute") String attribute, @Param("value") String value);
+
+ void clearCustom(@Param("handle") String handle, @Param("attr") String attr);
+
+ String selectWidthValue(@Param("site") String site, @Param("itemBo") String itemBo);
+
+ String selectAttributeByItemBo(@Param("itemBo") String shopOrder);
+}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ShopOrderMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ShopOrderMapper.java
new file mode 100644
index 00000000..e21f0765
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ShopOrderMapper.java
@@ -0,0 +1,18 @@
+package com.foreverwin.mesnac.meapi.mapper;
+
+import com.foreverwin.mesnac.meapi.model.ShopOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author Leon.L
+ * @since 2021-06-01
+ */
+@Repository
+public interface ShopOrderMapper extends BaseMapper {
+
+}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/CustomFields.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/CustomFields.java
new file mode 100644
index 00000000..5240aa79
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/CustomFields.java
@@ -0,0 +1,106 @@
+package com.foreverwin.mesnac.meapi.model;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+
+/**
+ *
+ *
+ *
+ *
+ * @author LZP
+ * @since 2021-06-01
+ */
+
+@TableName("CUSTOM_FIELDS")
+
+public class CustomFields extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableField("HANDLE")
+ private String handle;
+ @TableField("ATTRIBUTE")
+ private String attribute;
+ @TableField("VALUE")
+ private String value;
+ @TableField("CREATED_DATE_TIME")
+ private Date createdDateTime;
+ @TableField("MODIFIED_DATE_TIME")
+ private Date modifiedDateTime;
+
+
+ public String getHandle() {
+ return handle;
+ }
+
+ public void setHandle(String handle) {
+ this.handle = handle;
+ }
+
+ public String getAttribute() {
+ return attribute;
+ }
+
+ public void setAttribute(String attribute) {
+ this.attribute = attribute;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ public Date getCreatedDateTime() {
+ return createdDateTime;
+ }
+
+ public void setCreatedDateTime(Date createdDateTime) {
+ this.createdDateTime = createdDateTime;
+ }
+
+ public Date getModifiedDateTime() {
+ return modifiedDateTime;
+ }
+
+ public void setModifiedDateTime(Date modifiedDateTime) {
+ this.modifiedDateTime = modifiedDateTime;
+ }
+
+public static final String HANDLE = "HANDLE";
+
+public static final String ATTRIBUTE = "ATTRIBUTE";
+
+public static final String VALUE = "VALUE";
+
+public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME";
+
+public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.handle;
+ }
+
+ @Override
+ public String toString() {
+ return "CustomFields{" +
+ "handle = " + handle +
+ ", attribute = " + attribute +
+ ", value = " + value +
+ ", createdDateTime = " + createdDateTime +
+ ", modifiedDateTime = " + modifiedDateTime +
+ "}";
+ }
+}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java
new file mode 100644
index 00000000..8ba08265
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java
@@ -0,0 +1,755 @@
+package com.foreverwin.mesnac.meapi.model;
+
+import java.io.Serializable;
+
+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;
+
+/**
+ *
+ *
+ *
+ *
+ * @author Leon.L
+ * @since 2021-06-01
+ */
+
+@TableName("SHOP_ORDER")
+
+public class ShopOrder extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableField("HANDLE")
+ private String handle;
+ @TableField("CHANGE_STAMP")
+ private Long changeStamp;
+ @TableField("SITE")
+ private String site;
+ @TableField("SHOP_ORDER")
+ private String shopOrder;
+ @TableField("STATUS_BO")
+ private String statusBo;
+ @TableField("PRIORITY")
+ private Long priority;
+ @TableField("PLANNED_WORK_CENTER_BO")
+ private String plannedWorkCenterBo;
+ @TableField("PLANNED_ITEM_BO")
+ private String plannedItemBo;
+ @TableField("PLANNED_BOM_BO")
+ private String plannedBomBo;
+ @TableField("PLANNED_ROUTER_BO")
+ private String plannedRouterBo;
+ @TableField("ITEM_BO")
+ private String itemBo;
+ @TableField("BOM_BO")
+ private String bomBo;
+ @TableField("ROUTER_BO")
+ private String routerBo;
+ @TableField("QTY_TO_BUILD")
+ private Double qtyToBuild;
+ @TableField("QTY_ORDERED")
+ private Double qtyOrdered;
+ @TableField("QTY_RELEASED")
+ private Double qtyReleased;
+ @TableField("RELEASED_DATE")
+ private LocalDateTime releasedDate;
+ @TableField("PLANNED_START_DATE")
+ private LocalDateTime plannedStartDate;
+ @TableField("PLANNED_COMP_DATE")
+ private LocalDateTime plannedCompDate;
+ @TableField("SCHEDULED_START_DATE")
+ private LocalDateTime scheduledStartDate;
+ @TableField("SCHEDULED_COMP_DATE")
+ private LocalDateTime scheduledCompDate;
+ @TableField("ACTUAL_START_DATE")
+ private LocalDateTime actualStartDate;
+ @TableField("ACTUAL_COMP_DATE")
+ private LocalDateTime actualCompDate;
+ @TableField("QTY_DONE")
+ private Double qtyDone;
+ @TableField("QTY_SCRAPPED")
+ private Double qtyScrapped;
+ @TableField("CREATED_DATE_TIME")
+ private LocalDateTime createdDateTime;
+ @TableField("MODIFIED_DATE_TIME")
+ private LocalDateTime modifiedDateTime;
+ @TableField("CUSTOMER")
+ private String customer;
+ @TableField("CUSTOMER_ORDER")
+ private String customerOrder;
+ @TableField("RMA_SFC_DATA_TYPE_BO")
+ private String rmaSfcDataTypeBo;
+ @TableField("RMA_SHOP_ORDER_DATA_TYPE_BO")
+ private String rmaShopOrderDataTypeBo;
+ @TableField("ORIGINAL_STATUS_BO")
+ private String originalStatusBo;
+ @TableField("TRANSFER_SITE")
+ private String transferSite;
+ @TableField("TRANSFER_TYPE")
+ private String transferType;
+ @TableField("LCC_BO")
+ private String lccBo;
+ @TableField("SHOP_ORDER_TYPE_BO")
+ private String shopOrderTypeBo;
+ @TableField("HOLD_ID")
+ private Long holdId;
+ @TableField("END_UNIT_NUMBER")
+ private String endUnitNumber;
+ @TableField("REQ_SERIAL_CHANGE")
+ private String reqSerialChange;
+ @TableField("COLLECT_PARENT_SERIAL")
+ private String collectParentSerial;
+ @TableField("BATCH_NUMBER")
+ private String batchNumber;
+ @TableField("ERP_ORDER")
+ private String erpOrder;
+ @TableField("ERP_PRODUCTION_VERSION")
+ private String erpProductionVersion;
+ @TableField("ERP_UNIT_OF_MEASURE")
+ private String erpUnitOfMeasure;
+ @TableField("PARTITION_DATE")
+ private LocalDateTime partitionDate;
+ @TableField("INSPECTION_LOT")
+ private String inspectionLot;
+ @TableField("INSPECTION_GROUP_SIZE")
+ private Long inspectionGroupSize;
+ @TableField("ERP_PUTAWAY_STORLOC")
+ private String erpPutawayStorloc;
+ @TableField("WAREHOUSE_NUMBER")
+ private String warehouseNumber;
+ @TableField("UNDERDELIVERY_TOLERANCE")
+ private Double underdeliveryTolerance;
+ @TableField("OVERDELIVERY_TOLERANCE")
+ private Double overdeliveryTolerance;
+ @TableField("UNLIMITED_OVERDELIVERY")
+ private String unlimitedOverdelivery;
+ @TableField("MINIMUM_DELIVERY_QTY")
+ private Double minimumDeliveryQty;
+ @TableField("MAXIMUM_DELIVERY_QTY")
+ private Double maximumDeliveryQty;
+ @TableField("TOLERANCE_DEFINED_IN")
+ private String toleranceDefinedIn;
+
+
+ public String getHandle() {
+ return handle;
+ }
+
+ public void setHandle(String handle) {
+ this.handle = handle;
+ }
+
+ public Long getChangeStamp() {
+ return changeStamp;
+ }
+
+ public void setChangeStamp(Long changeStamp) {
+ this.changeStamp = changeStamp;
+ }
+
+ public String getSite() {
+ return site;
+ }
+
+ public void setSite(String site) {
+ this.site = site;
+ }
+
+ public String getShopOrder() {
+ return shopOrder;
+ }
+
+ public void setShopOrder(String shopOrder) {
+ this.shopOrder = shopOrder;
+ }
+
+ public String getStatusBo() {
+ return statusBo;
+ }
+
+ public void setStatusBo(String statusBo) {
+ this.statusBo = statusBo;
+ }
+
+ public Long getPriority() {
+ return priority;
+ }
+
+ public void setPriority(Long priority) {
+ this.priority = priority;
+ }
+
+ public String getPlannedWorkCenterBo() {
+ return plannedWorkCenterBo;
+ }
+
+ public void setPlannedWorkCenterBo(String plannedWorkCenterBo) {
+ this.plannedWorkCenterBo = plannedWorkCenterBo;
+ }
+
+ public String getPlannedItemBo() {
+ return plannedItemBo;
+ }
+
+ public void setPlannedItemBo(String plannedItemBo) {
+ this.plannedItemBo = plannedItemBo;
+ }
+
+ public String getPlannedBomBo() {
+ return plannedBomBo;
+ }
+
+ public void setPlannedBomBo(String plannedBomBo) {
+ this.plannedBomBo = plannedBomBo;
+ }
+
+ public String getPlannedRouterBo() {
+ return plannedRouterBo;
+ }
+
+ public void setPlannedRouterBo(String plannedRouterBo) {
+ this.plannedRouterBo = plannedRouterBo;
+ }
+
+ public String getItemBo() {
+ return itemBo;
+ }
+
+ public void setItemBo(String itemBo) {
+ this.itemBo = itemBo;
+ }
+
+ public String getBomBo() {
+ return bomBo;
+ }
+
+ public void setBomBo(String bomBo) {
+ this.bomBo = bomBo;
+ }
+
+ public String getRouterBo() {
+ return routerBo;
+ }
+
+ public void setRouterBo(String routerBo) {
+ this.routerBo = routerBo;
+ }
+
+ public Double getQtyToBuild() {
+ return qtyToBuild;
+ }
+
+ public void setQtyToBuild(Double qtyToBuild) {
+ this.qtyToBuild = qtyToBuild;
+ }
+
+ public Double getQtyOrdered() {
+ return qtyOrdered;
+ }
+
+ public void setQtyOrdered(Double qtyOrdered) {
+ this.qtyOrdered = qtyOrdered;
+ }
+
+ public Double getQtyReleased() {
+ return qtyReleased;
+ }
+
+ public void setQtyReleased(Double qtyReleased) {
+ this.qtyReleased = qtyReleased;
+ }
+
+ public LocalDateTime getReleasedDate() {
+ return releasedDate;
+ }
+
+ public void setReleasedDate(LocalDateTime releasedDate) {
+ this.releasedDate = releasedDate;
+ }
+
+ public LocalDateTime getPlannedStartDate() {
+ return plannedStartDate;
+ }
+
+ public void setPlannedStartDate(LocalDateTime plannedStartDate) {
+ this.plannedStartDate = plannedStartDate;
+ }
+
+ public LocalDateTime getPlannedCompDate() {
+ return plannedCompDate;
+ }
+
+ public void setPlannedCompDate(LocalDateTime plannedCompDate) {
+ this.plannedCompDate = plannedCompDate;
+ }
+
+ public LocalDateTime getScheduledStartDate() {
+ return scheduledStartDate;
+ }
+
+ public void setScheduledStartDate(LocalDateTime scheduledStartDate) {
+ this.scheduledStartDate = scheduledStartDate;
+ }
+
+ public LocalDateTime getScheduledCompDate() {
+ return scheduledCompDate;
+ }
+
+ public void setScheduledCompDate(LocalDateTime scheduledCompDate) {
+ this.scheduledCompDate = scheduledCompDate;
+ }
+
+ public LocalDateTime getActualStartDate() {
+ return actualStartDate;
+ }
+
+ public void setActualStartDate(LocalDateTime actualStartDate) {
+ this.actualStartDate = actualStartDate;
+ }
+
+ public LocalDateTime getActualCompDate() {
+ return actualCompDate;
+ }
+
+ public void setActualCompDate(LocalDateTime actualCompDate) {
+ this.actualCompDate = actualCompDate;
+ }
+
+ public Double getQtyDone() {
+ return qtyDone;
+ }
+
+ public void setQtyDone(Double qtyDone) {
+ this.qtyDone = qtyDone;
+ }
+
+ public Double getQtyScrapped() {
+ return qtyScrapped;
+ }
+
+ public void setQtyScrapped(Double qtyScrapped) {
+ this.qtyScrapped = qtyScrapped;
+ }
+
+ public LocalDateTime getCreatedDateTime() {
+ return createdDateTime;
+ }
+
+ public void setCreatedDateTime(LocalDateTime createdDateTime) {
+ this.createdDateTime = createdDateTime;
+ }
+
+ public LocalDateTime getModifiedDateTime() {
+ return modifiedDateTime;
+ }
+
+ public void setModifiedDateTime(LocalDateTime modifiedDateTime) {
+ this.modifiedDateTime = modifiedDateTime;
+ }
+
+ public String getCustomer() {
+ return customer;
+ }
+
+ public void setCustomer(String customer) {
+ this.customer = customer;
+ }
+
+ public String getCustomerOrder() {
+ return customerOrder;
+ }
+
+ public void setCustomerOrder(String customerOrder) {
+ this.customerOrder = customerOrder;
+ }
+
+ public String getRmaSfcDataTypeBo() {
+ return rmaSfcDataTypeBo;
+ }
+
+ public void setRmaSfcDataTypeBo(String rmaSfcDataTypeBo) {
+ this.rmaSfcDataTypeBo = rmaSfcDataTypeBo;
+ }
+
+ public String getRmaShopOrderDataTypeBo() {
+ return rmaShopOrderDataTypeBo;
+ }
+
+ public void setRmaShopOrderDataTypeBo(String rmaShopOrderDataTypeBo) {
+ this.rmaShopOrderDataTypeBo = rmaShopOrderDataTypeBo;
+ }
+
+ public String getOriginalStatusBo() {
+ return originalStatusBo;
+ }
+
+ public void setOriginalStatusBo(String originalStatusBo) {
+ this.originalStatusBo = originalStatusBo;
+ }
+
+ public String getTransferSite() {
+ return transferSite;
+ }
+
+ public void setTransferSite(String transferSite) {
+ this.transferSite = transferSite;
+ }
+
+ public String getTransferType() {
+ return transferType;
+ }
+
+ public void setTransferType(String transferType) {
+ this.transferType = transferType;
+ }
+
+ public String getLccBo() {
+ return lccBo;
+ }
+
+ public void setLccBo(String lccBo) {
+ this.lccBo = lccBo;
+ }
+
+ public String getShopOrderTypeBo() {
+ return shopOrderTypeBo;
+ }
+
+ public void setShopOrderTypeBo(String shopOrderTypeBo) {
+ this.shopOrderTypeBo = shopOrderTypeBo;
+ }
+
+ public Long getHoldId() {
+ return holdId;
+ }
+
+ public void setHoldId(Long holdId) {
+ this.holdId = holdId;
+ }
+
+ public String getEndUnitNumber() {
+ return endUnitNumber;
+ }
+
+ public void setEndUnitNumber(String endUnitNumber) {
+ this.endUnitNumber = endUnitNumber;
+ }
+
+ public String getReqSerialChange() {
+ return reqSerialChange;
+ }
+
+ public void setReqSerialChange(String reqSerialChange) {
+ this.reqSerialChange = reqSerialChange;
+ }
+
+ public String getCollectParentSerial() {
+ return collectParentSerial;
+ }
+
+ public void setCollectParentSerial(String collectParentSerial) {
+ this.collectParentSerial = collectParentSerial;
+ }
+
+ public String getBatchNumber() {
+ return batchNumber;
+ }
+
+ public void setBatchNumber(String batchNumber) {
+ this.batchNumber = batchNumber;
+ }
+
+ public String getErpOrder() {
+ return erpOrder;
+ }
+
+ public void setErpOrder(String erpOrder) {
+ this.erpOrder = erpOrder;
+ }
+
+ public String getErpProductionVersion() {
+ return erpProductionVersion;
+ }
+
+ public void setErpProductionVersion(String erpProductionVersion) {
+ this.erpProductionVersion = erpProductionVersion;
+ }
+
+ public String getErpUnitOfMeasure() {
+ return erpUnitOfMeasure;
+ }
+
+ public void setErpUnitOfMeasure(String erpUnitOfMeasure) {
+ this.erpUnitOfMeasure = erpUnitOfMeasure;
+ }
+
+ public LocalDateTime getPartitionDate() {
+ return partitionDate;
+ }
+
+ public void setPartitionDate(LocalDateTime partitionDate) {
+ this.partitionDate = partitionDate;
+ }
+
+ public String getInspectionLot() {
+ return inspectionLot;
+ }
+
+ public void setInspectionLot(String inspectionLot) {
+ this.inspectionLot = inspectionLot;
+ }
+
+ public Long getInspectionGroupSize() {
+ return inspectionGroupSize;
+ }
+
+ public void setInspectionGroupSize(Long inspectionGroupSize) {
+ this.inspectionGroupSize = inspectionGroupSize;
+ }
+
+ public String getErpPutawayStorloc() {
+ return erpPutawayStorloc;
+ }
+
+ public void setErpPutawayStorloc(String erpPutawayStorloc) {
+ this.erpPutawayStorloc = erpPutawayStorloc;
+ }
+
+ public String getWarehouseNumber() {
+ return warehouseNumber;
+ }
+
+ public void setWarehouseNumber(String warehouseNumber) {
+ this.warehouseNumber = warehouseNumber;
+ }
+
+ public Double getUnderdeliveryTolerance() {
+ return underdeliveryTolerance;
+ }
+
+ public void setUnderdeliveryTolerance(Double underdeliveryTolerance) {
+ this.underdeliveryTolerance = underdeliveryTolerance;
+ }
+
+ public Double getOverdeliveryTolerance() {
+ return overdeliveryTolerance;
+ }
+
+ public void setOverdeliveryTolerance(Double overdeliveryTolerance) {
+ this.overdeliveryTolerance = overdeliveryTolerance;
+ }
+
+ public String getUnlimitedOverdelivery() {
+ return unlimitedOverdelivery;
+ }
+
+ public void setUnlimitedOverdelivery(String unlimitedOverdelivery) {
+ this.unlimitedOverdelivery = unlimitedOverdelivery;
+ }
+
+ public Double getMinimumDeliveryQty() {
+ return minimumDeliveryQty;
+ }
+
+ public void setMinimumDeliveryQty(Double minimumDeliveryQty) {
+ this.minimumDeliveryQty = minimumDeliveryQty;
+ }
+
+ public Double getMaximumDeliveryQty() {
+ return maximumDeliveryQty;
+ }
+
+ public void setMaximumDeliveryQty(Double maximumDeliveryQty) {
+ this.maximumDeliveryQty = maximumDeliveryQty;
+ }
+
+ public String getToleranceDefinedIn() {
+ return toleranceDefinedIn;
+ }
+
+ public void setToleranceDefinedIn(String toleranceDefinedIn) {
+ this.toleranceDefinedIn = toleranceDefinedIn;
+ }
+
+public static final String HANDLE = "HANDLE";
+
+public static final String CHANGE_STAMP = "CHANGE_STAMP";
+
+public static final String SITE = "SITE";
+
+public static final String SHOP_ORDER = "SHOP_ORDER";
+
+public static final String STATUS_BO = "STATUS_BO";
+
+public static final String PRIORITY = "PRIORITY";
+
+public static final String PLANNED_WORK_CENTER_BO = "PLANNED_WORK_CENTER_BO";
+
+public static final String PLANNED_ITEM_BO = "PLANNED_ITEM_BO";
+
+public static final String PLANNED_BOM_BO = "PLANNED_BOM_BO";
+
+public static final String PLANNED_ROUTER_BO = "PLANNED_ROUTER_BO";
+
+public static final String ITEM_BO = "ITEM_BO";
+
+public static final String BOM_BO = "BOM_BO";
+
+public static final String ROUTER_BO = "ROUTER_BO";
+
+public static final String QTY_TO_BUILD = "QTY_TO_BUILD";
+
+public static final String QTY_ORDERED = "QTY_ORDERED";
+
+public static final String QTY_RELEASED = "QTY_RELEASED";
+
+public static final String RELEASED_DATE = "RELEASED_DATE";
+
+public static final String PLANNED_START_DATE = "PLANNED_START_DATE";
+
+public static final String PLANNED_COMP_DATE = "PLANNED_COMP_DATE";
+
+public static final String SCHEDULED_START_DATE = "SCHEDULED_START_DATE";
+
+public static final String SCHEDULED_COMP_DATE = "SCHEDULED_COMP_DATE";
+
+public static final String ACTUAL_START_DATE = "ACTUAL_START_DATE";
+
+public static final String ACTUAL_COMP_DATE = "ACTUAL_COMP_DATE";
+
+public static final String QTY_DONE = "QTY_DONE";
+
+public static final String QTY_SCRAPPED = "QTY_SCRAPPED";
+
+public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME";
+
+public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
+
+public static final String CUSTOMER = "CUSTOMER";
+
+public static final String CUSTOMER_ORDER = "CUSTOMER_ORDER";
+
+public static final String RMA_SFC_DATA_TYPE_BO = "RMA_SFC_DATA_TYPE_BO";
+
+public static final String RMA_SHOP_ORDER_DATA_TYPE_BO = "RMA_SHOP_ORDER_DATA_TYPE_BO";
+
+public static final String ORIGINAL_STATUS_BO = "ORIGINAL_STATUS_BO";
+
+public static final String TRANSFER_SITE = "TRANSFER_SITE";
+
+public static final String TRANSFER_TYPE = "TRANSFER_TYPE";
+
+public static final String LCC_BO = "LCC_BO";
+
+public static final String SHOP_ORDER_TYPE_BO = "SHOP_ORDER_TYPE_BO";
+
+public static final String HOLD_ID = "HOLD_ID";
+
+public static final String END_UNIT_NUMBER = "END_UNIT_NUMBER";
+
+public static final String REQ_SERIAL_CHANGE = "REQ_SERIAL_CHANGE";
+
+public static final String COLLECT_PARENT_SERIAL = "COLLECT_PARENT_SERIAL";
+
+public static final String BATCH_NUMBER = "BATCH_NUMBER";
+
+public static final String ERP_ORDER = "ERP_ORDER";
+
+public static final String ERP_PRODUCTION_VERSION = "ERP_PRODUCTION_VERSION";
+
+public static final String ERP_UNIT_OF_MEASURE = "ERP_UNIT_OF_MEASURE";
+
+public static final String PARTITION_DATE = "PARTITION_DATE";
+
+public static final String INSPECTION_LOT = "INSPECTION_LOT";
+
+public static final String INSPECTION_GROUP_SIZE = "INSPECTION_GROUP_SIZE";
+
+public static final String ERP_PUTAWAY_STORLOC = "ERP_PUTAWAY_STORLOC";
+
+public static final String WAREHOUSE_NUMBER = "WAREHOUSE_NUMBER";
+
+public static final String UNDERDELIVERY_TOLERANCE = "UNDERDELIVERY_TOLERANCE";
+
+public static final String OVERDELIVERY_TOLERANCE = "OVERDELIVERY_TOLERANCE";
+
+public static final String UNLIMITED_OVERDELIVERY = "UNLIMITED_OVERDELIVERY";
+
+public static final String MINIMUM_DELIVERY_QTY = "MINIMUM_DELIVERY_QTY";
+
+public static final String MAXIMUM_DELIVERY_QTY = "MAXIMUM_DELIVERY_QTY";
+
+public static final String TOLERANCE_DEFINED_IN = "TOLERANCE_DEFINED_IN";
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.handle;
+ }
+
+ @Override
+ public String toString() {
+ return "ShopOrder{" +
+ "handle = " + handle +
+ ", changeStamp = " + changeStamp +
+ ", site = " + site +
+ ", shopOrder = " + shopOrder +
+ ", statusBo = " + statusBo +
+ ", priority = " + priority +
+ ", plannedWorkCenterBo = " + plannedWorkCenterBo +
+ ", plannedItemBo = " + plannedItemBo +
+ ", plannedBomBo = " + plannedBomBo +
+ ", plannedRouterBo = " + plannedRouterBo +
+ ", itemBo = " + itemBo +
+ ", bomBo = " + bomBo +
+ ", routerBo = " + routerBo +
+ ", qtyToBuild = " + qtyToBuild +
+ ", qtyOrdered = " + qtyOrdered +
+ ", qtyReleased = " + qtyReleased +
+ ", releasedDate = " + releasedDate +
+ ", plannedStartDate = " + plannedStartDate +
+ ", plannedCompDate = " + plannedCompDate +
+ ", scheduledStartDate = " + scheduledStartDate +
+ ", scheduledCompDate = " + scheduledCompDate +
+ ", actualStartDate = " + actualStartDate +
+ ", actualCompDate = " + actualCompDate +
+ ", qtyDone = " + qtyDone +
+ ", qtyScrapped = " + qtyScrapped +
+ ", createdDateTime = " + createdDateTime +
+ ", modifiedDateTime = " + modifiedDateTime +
+ ", customer = " + customer +
+ ", customerOrder = " + customerOrder +
+ ", rmaSfcDataTypeBo = " + rmaSfcDataTypeBo +
+ ", rmaShopOrderDataTypeBo = " + rmaShopOrderDataTypeBo +
+ ", originalStatusBo = " + originalStatusBo +
+ ", transferSite = " + transferSite +
+ ", transferType = " + transferType +
+ ", lccBo = " + lccBo +
+ ", shopOrderTypeBo = " + shopOrderTypeBo +
+ ", holdId = " + holdId +
+ ", endUnitNumber = " + endUnitNumber +
+ ", reqSerialChange = " + reqSerialChange +
+ ", collectParentSerial = " + collectParentSerial +
+ ", batchNumber = " + batchNumber +
+ ", erpOrder = " + erpOrder +
+ ", erpProductionVersion = " + erpProductionVersion +
+ ", erpUnitOfMeasure = " + erpUnitOfMeasure +
+ ", partitionDate = " + partitionDate +
+ ", inspectionLot = " + inspectionLot +
+ ", inspectionGroupSize = " + inspectionGroupSize +
+ ", erpPutawayStorloc = " + erpPutawayStorloc +
+ ", warehouseNumber = " + warehouseNumber +
+ ", underdeliveryTolerance = " + underdeliveryTolerance +
+ ", overdeliveryTolerance = " + overdeliveryTolerance +
+ ", unlimitedOverdelivery = " + unlimitedOverdelivery +
+ ", minimumDeliveryQty = " + minimumDeliveryQty +
+ ", maximumDeliveryQty = " + maximumDeliveryQty +
+ ", toleranceDefinedIn = " + toleranceDefinedIn +
+ "}";
+ }
+}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/CustomFieldsService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/CustomFieldsService.java
new file mode 100644
index 00000000..1e88d5a4
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/CustomFieldsService.java
@@ -0,0 +1,104 @@
+package com.foreverwin.mesnac.meapi.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.foreverwin.mesnac.meapi.model.CustomFields;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.foreverwin.modular.core.util.FrontPage;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author LZP
+ * @since 2021-06-01
+ */
+public interface CustomFieldsService extends IService {
+
+ /**
+ * 分页查询
+ * @param frontPage
+ * @return
+ */
+ IPage selectPage(FrontPage frontPage, CustomFields customFields);
+
+ List selectList(CustomFields customFields);
+
+
+ /**
+ * 查找自定义数据
+ * @param customFields
+ * @return
+ */
+ CustomFields selectOne(CustomFields customFields);
+
+ /**
+ * @Author zero
+ * 查询自定义数据
+ * @return
+ */
+ String getCustomFieldsValue(String handle, String attribute);
+
+ /**
+ * 查询机型
+ * @param site
+ * @param resourceType
+ * @return
+ */
+ List> getEquipType(String site, String resourceType);
+
+ /**
+ * @Author zero
+ * 查询自定义数据
+ * @param handle 必需
+ * @param attribute 非必需
+ * @return
+ */
+ List getCustomFields(String handle, String attribute);
+
+ /**
+ * 查找自定义数据
+ * @param handle
+ * @return
+ */
+ List getCustomFieldsByHandle(String handle);
+
+ @Transactional(propagation = Propagation.REQUIRES_NEW)
+ void setCustomWithNewTransaction(String handle, String attribute, String value);
+
+ /**
+ * 更改自定义数据
+ * @param handle
+ * @param attribute
+ * @param value
+ */
+ void setCustom(String handle, String attribute, String value);
+
+ /**
+ * 查询物料组维护的打印模板
+ * @param sfcBo
+ * @return
+ */
+ Map getItemGroupPrintTemplate(String sfcBo);
+
+ /**
+ * 查询物料组维护的打印模板
+ * @param itemBo
+ * @return
+ */
+ Map getItemGroupPrintTemplateByItemBo(String itemBo);
+
+ /**
+ * 查询分条前物料的宽度
+ * @param itemBo
+ * @return
+ */
+ String selectWidthValue(String site, String itemBo);
+
+ String selectAttributeByItemBo(String itemBo);
+}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ShopOrderService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ShopOrderService.java
new file mode 100644
index 00000000..b86ea30a
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ShopOrderService.java
@@ -0,0 +1,28 @@
+package com.foreverwin.mesnac.meapi.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.foreverwin.mesnac.meapi.model.ShopOrder;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.foreverwin.modular.core.util.FrontPage;
+
+import java.util.List;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author Leon.L
+ * @since 2021-06-01
+ */
+public interface ShopOrderService extends IService {
+
+ /**
+ * 分页查询
+ * @param frontPage
+ * @return
+ */
+ IPage selectPage(FrontPage frontPage, ShopOrder shopOrder);
+
+ List selectList(ShopOrder shopOrder);
+}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/CustomFieldsServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/CustomFieldsServiceImpl.java
new file mode 100644
index 00000000..b988e841
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/CustomFieldsServiceImpl.java
@@ -0,0 +1,135 @@
+package com.foreverwin.mesnac.meapi.service.impl;
+
+import com.foreverwin.modular.core.util.FrontPage;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.foreverwin.mesnac.meapi.model.CustomFields;
+import com.foreverwin.mesnac.meapi.mapper.CustomFieldsMapper;
+import com.foreverwin.mesnac.meapi.service.CustomFieldsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author LZP
+ * @since 2021-06-01
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class CustomFieldsServiceImpl extends ServiceImpl implements CustomFieldsService {
+
+ private static Logger logger = LogManager.getLogger(CustomFieldsServiceImpl.class);
+
+ @Autowired
+ private CustomFieldsMapper customFieldsMapper;
+
+ @Autowired
+ private CustomFieldsService customFieldsService;
+
+ @Override
+ public CustomFields selectOne(CustomFields customFields) {
+ QueryWrapper qw = new QueryWrapper();
+ qw.setEntity( customFields );
+ return customFieldsMapper.selectOne( qw );
+ }
+
+ @Override
+ public String getCustomFieldsValue(String handle, String attribute) {
+ return customFieldsMapper.selectCustomFieldsValue(handle, attribute);
+ }
+
+ @Override
+ public List> getEquipType(String site, String equipType) {
+ return customFieldsMapper.selectEquipType(site,equipType);
+ }
+
+ @Override
+ public List getCustomFields(String handle,String attribute) {
+ return customFieldsMapper.selectCustomFields(handle,attribute);
+ }
+
+ @Override
+ public List getCustomFieldsByHandle(String handle) {
+ return customFieldsMapper.selectCustomFieldsByHandle(handle);
+ }
+
+ @Override
+ @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+ public void setCustomWithNewTransaction(String handle, String attribute, String value) {
+ setCustom(handle, attribute, value);
+ }
+
+ public void setCustom(String handle, String attribute, String value) {
+ Date nowDate = new Date();
+ QueryWrapper customFieldsWrapper = new QueryWrapper<>();
+ customFieldsWrapper.eq("HANDLE",handle);
+ customFieldsWrapper.eq("ATTRIBUTE",attribute);
+ List list= customFieldsMapper.selectList(customFieldsWrapper);
+
+ //实体赋值
+ CustomFields customFields = new CustomFields();
+ customFields.setHandle(handle);
+ customFields.setAttribute(attribute);
+ customFields.setValue(value);
+
+ if(list.isEmpty()){
+ customFields.setCreatedDateTime(nowDate);
+ customFields.setModifiedDateTime(nowDate);
+ customFieldsMapper.insert(customFields);//insertAllColumn
+ }else{
+ customFields.setModifiedDateTime(nowDate);
+ customFieldsMapper.update(customFields,customFieldsWrapper);
+ }
+ logger.info("custom fields created: {}, {}", handle, list.isEmpty());
+ }
+
+ @Override
+ public Map getItemGroupPrintTemplate(String sfcBo) {
+ return customFieldsMapper.selectItemGroupPrintTemplate(sfcBo);
+ }
+
+ @Override
+ public Map getItemGroupPrintTemplateByItemBo(String itemBo) {
+ return customFieldsMapper.selectItemGroupPrintTemplateByItemBo(itemBo);
+ }
+
+ @Override
+ public String selectWidthValue(String site, String itemBo) {
+ return customFieldsMapper.selectWidthValue(site, itemBo);
+ }
+
+ @Override
+ public String selectAttributeByItemBo(String itemBo) {
+ return customFieldsMapper.selectAttributeByItemBo(itemBo);
+ }
+
+
+
+ @Override
+ public IPage selectPage(FrontPage frontPage, CustomFields customFields) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(customFields);
+ return super.page(frontPage.getPagePlus(), queryWrapper);
+ }
+
+ @Override
+ public List selectList(CustomFields customFields) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(customFields);
+ return super.list(queryWrapper);
+ }
+
+
+}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java
new file mode 100644
index 00000000..d332510e
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java
@@ -0,0 +1,46 @@
+package com.foreverwin.mesnac.meapi.service.impl;
+
+import com.foreverwin.modular.core.util.FrontPage;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.foreverwin.mesnac.meapi.model.ShopOrder;
+import com.foreverwin.mesnac.meapi.mapper.ShopOrderMapper;
+import com.foreverwin.mesnac.meapi.service.ShopOrderService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author Leon.L
+ * @since 2021-06-01
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class ShopOrderServiceImpl extends ServiceImpl implements ShopOrderService {
+
+
+ @Autowired
+ private ShopOrderMapper shopOrderMapper;
+
+ @Override
+ public IPage selectPage(FrontPage frontPage, ShopOrder shopOrder) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(shopOrder);
+ return super.page(frontPage.getPagePlus(), queryWrapper);
+ }
+
+ @Override
+ public List selectList(ShopOrder shopOrder) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(shopOrder);
+ return super.list(queryWrapper);
+ }
+
+
+}
\ No newline at end of file
diff --git a/meapi/src/main/resources/mapper/CustomFieldsMapper.xml b/meapi/src/main/resources/mapper/CustomFieldsMapper.xml
new file mode 100644
index 00000000..74668e47
--- /dev/null
+++ b/meapi/src/main/resources/mapper/CustomFieldsMapper.xml
@@ -0,0 +1,290 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ HANDLE, ATTRIBUTE, VALUE, CREATED_DATE_TIME, MODIFIED_DATE_TIME
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ INSERT INTO CUSTOM_FIELDS
+
+ HANDLE,
+ ATTRIBUTE,
+ VALUE,
+ CREATED_DATE_TIME,
+ MODIFIED_DATE_TIME,
+ VALUES
+
+ #{handle},
+ #{attribute},
+ #{value},
+ #{createdDateTime},
+ #{modifiedDateTime},
+
+
+
+
+ INSERT INTO CUSTOM_FIELDS
+
+
+ VALUES
+
+ #{handle},
+ #{attribute},
+ #{value},
+ #{createdDateTime},
+ #{modifiedDateTime},
+
+
+
+
+
+
+
+
+
+ UPDATE CUSTOM_FIELDS
+ HANDLE=#{et.handle},
+ ATTRIBUTE=#{et.attribute},
+ VALUE=#{et.value},
+ CREATED_DATE_TIME=#{et.createdDateTime},
+ MODIFIED_DATE_TIME=#{et.modifiedDateTime},
+
+
+
+
+ HANDLE=#{ew.entity.handle}
+ AND ATTRIBUTE=#{ew.entity.attribute}
+ AND VALUE=#{ew.entity.value}
+ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}
+ AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
+
+
+ ${ew.sqlSegment}
+
+
+
+
+ ${ew.sqlSegment}
+
+
+
+
+
+ DELETE FROM CUSTOM_FIELDS
+
+
+
+
+ ${k} = #{cm[${k}]}
+
+
+
+
+
+
+
+ DELETE FROM CUSTOM_FIELDS
+
+
+
+
+ HANDLE=#{ew.entity.handle}
+
+ AND ATTRIBUTE=#{ew.entity.attribute}
+ AND VALUE=#{ew.entity.value}
+ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}
+ AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
+
+
+ ${ew.sqlSegment}
+
+
+
+
+ ${ew.sqlSegment}
+
+
+
+
+
+
diff --git a/meapi/src/main/resources/mapper/ItemMapper.xml b/meapi/src/main/resources/mapper/ItemMapper.xml
index 52581aa6..ca10b032 100644
--- a/meapi/src/main/resources/mapper/ItemMapper.xml
+++ b/meapi/src/main/resources/mapper/ItemMapper.xml
@@ -249,128 +249,46 @@
-
-
-
-
-
-
diff --git a/meapi/src/main/resources/mapper/ResrceMapper.xml b/meapi/src/main/resources/mapper/ResrceMapper.xml
index 78c336e6..c6881b60 100644
--- a/meapi/src/main/resources/mapper/ResrceMapper.xml
+++ b/meapi/src/main/resources/mapper/ResrceMapper.xml
@@ -247,7 +247,8 @@
diff --git a/meapi/src/main/resources/mapper/ShopOrderMapper.xml b/meapi/src/main/resources/mapper/ShopOrderMapper.xml
new file mode 100644
index 00000000..6a841b71
--- /dev/null
+++ b/meapi/src/main/resources/mapper/ShopOrderMapper.xml
@@ -0,0 +1,990 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ HANDLE, CHANGE_STAMP, SITE, SHOP_ORDER, STATUS_BO, PRIORITY, PLANNED_WORK_CENTER_BO, PLANNED_ITEM_BO, PLANNED_BOM_BO, PLANNED_ROUTER_BO, ITEM_BO, BOM_BO, ROUTER_BO, QTY_TO_BUILD, QTY_ORDERED, QTY_RELEASED, RELEASED_DATE, PLANNED_START_DATE, PLANNED_COMP_DATE, SCHEDULED_START_DATE, SCHEDULED_COMP_DATE, ACTUAL_START_DATE, ACTUAL_COMP_DATE, QTY_DONE, QTY_SCRAPPED, CREATED_DATE_TIME, MODIFIED_DATE_TIME, CUSTOMER, CUSTOMER_ORDER, RMA_SFC_DATA_TYPE_BO, RMA_SHOP_ORDER_DATA_TYPE_BO, ORIGINAL_STATUS_BO, TRANSFER_SITE, TRANSFER_TYPE, LCC_BO, SHOP_ORDER_TYPE_BO, HOLD_ID, END_UNIT_NUMBER, REQ_SERIAL_CHANGE, COLLECT_PARENT_SERIAL, BATCH_NUMBER, ERP_ORDER, ERP_PRODUCTION_VERSION, ERP_UNIT_OF_MEASURE, PARTITION_DATE, INSPECTION_LOT, INSPECTION_GROUP_SIZE, ERP_PUTAWAY_STORLOC, WAREHOUSE_NUMBER, UNDERDELIVERY_TOLERANCE, OVERDELIVERY_TOLERANCE, UNLIMITED_OVERDELIVERY, MINIMUM_DELIVERY_QTY, MAXIMUM_DELIVERY_QTY, TOLERANCE_DEFINED_IN
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ INSERT INTO SHOP_ORDER
+
+ HANDLE,
+ CHANGE_STAMP,
+ SITE,
+ SHOP_ORDER,
+ STATUS_BO,
+ PRIORITY,
+ PLANNED_WORK_CENTER_BO,
+ PLANNED_ITEM_BO,
+ PLANNED_BOM_BO,
+ PLANNED_ROUTER_BO,
+ ITEM_BO,
+ BOM_BO,
+ ROUTER_BO,
+ QTY_TO_BUILD,
+ QTY_ORDERED,
+ QTY_RELEASED,
+ RELEASED_DATE,
+ PLANNED_START_DATE,
+ PLANNED_COMP_DATE,
+ SCHEDULED_START_DATE,
+ SCHEDULED_COMP_DATE,
+ ACTUAL_START_DATE,
+ ACTUAL_COMP_DATE,
+ QTY_DONE,
+ QTY_SCRAPPED,
+ CREATED_DATE_TIME,
+ MODIFIED_DATE_TIME,
+ CUSTOMER,
+ CUSTOMER_ORDER,
+ RMA_SFC_DATA_TYPE_BO,
+ RMA_SHOP_ORDER_DATA_TYPE_BO,
+ ORIGINAL_STATUS_BO,
+ TRANSFER_SITE,
+ TRANSFER_TYPE,
+ LCC_BO,
+ SHOP_ORDER_TYPE_BO,
+ HOLD_ID,
+ END_UNIT_NUMBER,
+ REQ_SERIAL_CHANGE,
+ COLLECT_PARENT_SERIAL,
+ BATCH_NUMBER,
+ ERP_ORDER,
+ ERP_PRODUCTION_VERSION,
+ ERP_UNIT_OF_MEASURE,
+ PARTITION_DATE,
+ INSPECTION_LOT,
+ INSPECTION_GROUP_SIZE,
+ ERP_PUTAWAY_STORLOC,
+ WAREHOUSE_NUMBER,
+ UNDERDELIVERY_TOLERANCE,
+ OVERDELIVERY_TOLERANCE,
+ UNLIMITED_OVERDELIVERY,
+ MINIMUM_DELIVERY_QTY,
+ MAXIMUM_DELIVERY_QTY,
+ TOLERANCE_DEFINED_IN,
+ VALUES
+
+ #{handle},
+ #{changeStamp},
+ #{site},
+ #{shopOrder},
+ #{statusBo},
+ #{priority},
+ #{plannedWorkCenterBo},
+ #{plannedItemBo},
+ #{plannedBomBo},
+ #{plannedRouterBo},
+ #{itemBo},
+ #{bomBo},
+ #{routerBo},
+ #{qtyToBuild},
+ #{qtyOrdered},
+ #{qtyReleased},
+ #{releasedDate},
+ #{plannedStartDate},
+ #{plannedCompDate},
+ #{scheduledStartDate},
+ #{scheduledCompDate},
+ #{actualStartDate},
+ #{actualCompDate},
+ #{qtyDone},
+ #{qtyScrapped},
+ #{createdDateTime},
+ #{modifiedDateTime},
+ #{customer},
+ #{customerOrder},
+ #{rmaSfcDataTypeBo},
+ #{rmaShopOrderDataTypeBo},
+ #{originalStatusBo},
+ #{transferSite},
+ #{transferType},
+ #{lccBo},
+ #{shopOrderTypeBo},
+ #{holdId},
+ #{endUnitNumber},
+ #{reqSerialChange},
+ #{collectParentSerial},
+ #{batchNumber},
+ #{erpOrder},
+ #{erpProductionVersion},
+ #{erpUnitOfMeasure},
+ #{partitionDate},
+ #{inspectionLot},
+ #{inspectionGroupSize},
+ #{erpPutawayStorloc},
+ #{warehouseNumber},
+ #{underdeliveryTolerance},
+ #{overdeliveryTolerance},
+ #{unlimitedOverdelivery},
+ #{minimumDeliveryQty},
+ #{maximumDeliveryQty},
+ #{toleranceDefinedIn},
+
+
+
+
+ INSERT INTO SHOP_ORDER
+
+
+ VALUES
+
+ #{handle},
+ #{changeStamp},
+ #{site},
+ #{shopOrder},
+ #{statusBo},
+ #{priority},
+ #{plannedWorkCenterBo},
+ #{plannedItemBo},
+ #{plannedBomBo},
+ #{plannedRouterBo},
+ #{itemBo},
+ #{bomBo},
+ #{routerBo},
+ #{qtyToBuild},
+ #{qtyOrdered},
+ #{qtyReleased},
+ #{releasedDate},
+ #{plannedStartDate},
+ #{plannedCompDate},
+ #{scheduledStartDate},
+ #{scheduledCompDate},
+ #{actualStartDate},
+ #{actualCompDate},
+ #{qtyDone},
+ #{qtyScrapped},
+ #{createdDateTime},
+ #{modifiedDateTime},
+ #{customer},
+ #{customerOrder},
+ #{rmaSfcDataTypeBo},
+ #{rmaShopOrderDataTypeBo},
+ #{originalStatusBo},
+ #{transferSite},
+ #{transferType},
+ #{lccBo},
+ #{shopOrderTypeBo},
+ #{holdId},
+ #{endUnitNumber},
+ #{reqSerialChange},
+ #{collectParentSerial},
+ #{batchNumber},
+ #{erpOrder},
+ #{erpProductionVersion},
+ #{erpUnitOfMeasure},
+ #{partitionDate},
+ #{inspectionLot},
+ #{inspectionGroupSize},
+ #{erpPutawayStorloc},
+ #{warehouseNumber},
+ #{underdeliveryTolerance},
+ #{overdeliveryTolerance},
+ #{unlimitedOverdelivery},
+ #{minimumDeliveryQty},
+ #{maximumDeliveryQty},
+ #{toleranceDefinedIn},
+
+
+
+
+
+
+
+
+
+ UPDATE SHOP_ORDER
+ HANDLE=#{et.handle},
+ CHANGE_STAMP=#{et.changeStamp},
+ SITE=#{et.site},
+ SHOP_ORDER=#{et.shopOrder},
+ STATUS_BO=#{et.statusBo},
+ PRIORITY=#{et.priority},
+ PLANNED_WORK_CENTER_BO=#{et.plannedWorkCenterBo},
+ PLANNED_ITEM_BO=#{et.plannedItemBo},
+ PLANNED_BOM_BO=#{et.plannedBomBo},
+ PLANNED_ROUTER_BO=#{et.plannedRouterBo},
+ ITEM_BO=#{et.itemBo},
+ BOM_BO=#{et.bomBo},
+ ROUTER_BO=#{et.routerBo},
+ QTY_TO_BUILD=#{et.qtyToBuild},
+ QTY_ORDERED=#{et.qtyOrdered},
+ QTY_RELEASED=#{et.qtyReleased},
+ RELEASED_DATE=#{et.releasedDate},
+ PLANNED_START_DATE=#{et.plannedStartDate},
+ PLANNED_COMP_DATE=#{et.plannedCompDate},
+ SCHEDULED_START_DATE=#{et.scheduledStartDate},
+ SCHEDULED_COMP_DATE=#{et.scheduledCompDate},
+ ACTUAL_START_DATE=#{et.actualStartDate},
+ ACTUAL_COMP_DATE=#{et.actualCompDate},
+ QTY_DONE=#{et.qtyDone},
+ QTY_SCRAPPED=#{et.qtyScrapped},
+ CREATED_DATE_TIME=#{et.createdDateTime},
+ MODIFIED_DATE_TIME=#{et.modifiedDateTime},
+ CUSTOMER=#{et.customer},
+ CUSTOMER_ORDER=#{et.customerOrder},
+ RMA_SFC_DATA_TYPE_BO=#{et.rmaSfcDataTypeBo},
+ RMA_SHOP_ORDER_DATA_TYPE_BO=#{et.rmaShopOrderDataTypeBo},
+ ORIGINAL_STATUS_BO=#{et.originalStatusBo},
+ TRANSFER_SITE=#{et.transferSite},
+ TRANSFER_TYPE=#{et.transferType},
+ LCC_BO=#{et.lccBo},
+ SHOP_ORDER_TYPE_BO=#{et.shopOrderTypeBo},
+ HOLD_ID=#{et.holdId},
+ END_UNIT_NUMBER=#{et.endUnitNumber},
+ REQ_SERIAL_CHANGE=#{et.reqSerialChange},
+ COLLECT_PARENT_SERIAL=#{et.collectParentSerial},
+ BATCH_NUMBER=#{et.batchNumber},
+ ERP_ORDER=#{et.erpOrder},
+ ERP_PRODUCTION_VERSION=#{et.erpProductionVersion},
+ ERP_UNIT_OF_MEASURE=#{et.erpUnitOfMeasure},
+ PARTITION_DATE=#{et.partitionDate},
+ INSPECTION_LOT=#{et.inspectionLot},
+ INSPECTION_GROUP_SIZE=#{et.inspectionGroupSize},
+ ERP_PUTAWAY_STORLOC=#{et.erpPutawayStorloc},
+ WAREHOUSE_NUMBER=#{et.warehouseNumber},
+ UNDERDELIVERY_TOLERANCE=#{et.underdeliveryTolerance},
+ OVERDELIVERY_TOLERANCE=#{et.overdeliveryTolerance},
+ UNLIMITED_OVERDELIVERY=#{et.unlimitedOverdelivery},
+ MINIMUM_DELIVERY_QTY=#{et.minimumDeliveryQty},
+ MAXIMUM_DELIVERY_QTY=#{et.maximumDeliveryQty},
+ TOLERANCE_DEFINED_IN=#{et.toleranceDefinedIn},
+
+
+
+
+ HANDLE=#{ew.entity.handle}
+ AND CHANGE_STAMP=#{ew.entity.changeStamp}
+ AND SITE=#{ew.entity.site}
+ AND SHOP_ORDER=#{ew.entity.shopOrder}
+ AND STATUS_BO=#{ew.entity.statusBo}
+ AND PRIORITY=#{ew.entity.priority}
+ AND PLANNED_WORK_CENTER_BO=#{ew.entity.plannedWorkCenterBo}
+ AND PLANNED_ITEM_BO=#{ew.entity.plannedItemBo}
+ AND PLANNED_BOM_BO=#{ew.entity.plannedBomBo}
+ AND PLANNED_ROUTER_BO=#{ew.entity.plannedRouterBo}
+ AND ITEM_BO=#{ew.entity.itemBo}
+ AND BOM_BO=#{ew.entity.bomBo}
+ AND ROUTER_BO=#{ew.entity.routerBo}
+ AND QTY_TO_BUILD=#{ew.entity.qtyToBuild}
+ AND QTY_ORDERED=#{ew.entity.qtyOrdered}
+ AND QTY_RELEASED=#{ew.entity.qtyReleased}
+ AND RELEASED_DATE=#{ew.entity.releasedDate}
+ AND PLANNED_START_DATE=#{ew.entity.plannedStartDate}
+ AND PLANNED_COMP_DATE=#{ew.entity.plannedCompDate}
+ AND SCHEDULED_START_DATE=#{ew.entity.scheduledStartDate}
+ AND SCHEDULED_COMP_DATE=#{ew.entity.scheduledCompDate}
+ AND ACTUAL_START_DATE=#{ew.entity.actualStartDate}
+ AND ACTUAL_COMP_DATE=#{ew.entity.actualCompDate}
+ AND QTY_DONE=#{ew.entity.qtyDone}
+ AND QTY_SCRAPPED=#{ew.entity.qtyScrapped}
+ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}
+ AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
+ AND CUSTOMER=#{ew.entity.customer}
+ AND CUSTOMER_ORDER=#{ew.entity.customerOrder}
+ AND RMA_SFC_DATA_TYPE_BO=#{ew.entity.rmaSfcDataTypeBo}
+ AND RMA_SHOP_ORDER_DATA_TYPE_BO=#{ew.entity.rmaShopOrderDataTypeBo}
+ AND ORIGINAL_STATUS_BO=#{ew.entity.originalStatusBo}
+ AND TRANSFER_SITE=#{ew.entity.transferSite}
+ AND TRANSFER_TYPE=#{ew.entity.transferType}
+ AND LCC_BO=#{ew.entity.lccBo}
+ AND SHOP_ORDER_TYPE_BO=#{ew.entity.shopOrderTypeBo}
+ AND HOLD_ID=#{ew.entity.holdId}
+ AND END_UNIT_NUMBER=#{ew.entity.endUnitNumber}
+ AND REQ_SERIAL_CHANGE=#{ew.entity.reqSerialChange}
+ AND COLLECT_PARENT_SERIAL=#{ew.entity.collectParentSerial}
+ AND BATCH_NUMBER=#{ew.entity.batchNumber}
+ AND ERP_ORDER=#{ew.entity.erpOrder}
+ AND ERP_PRODUCTION_VERSION=#{ew.entity.erpProductionVersion}
+ AND ERP_UNIT_OF_MEASURE=#{ew.entity.erpUnitOfMeasure}
+ AND PARTITION_DATE=#{ew.entity.partitionDate}
+ AND INSPECTION_LOT=#{ew.entity.inspectionLot}
+ AND INSPECTION_GROUP_SIZE=#{ew.entity.inspectionGroupSize}
+ AND ERP_PUTAWAY_STORLOC=#{ew.entity.erpPutawayStorloc}
+ AND WAREHOUSE_NUMBER=#{ew.entity.warehouseNumber}
+ AND UNDERDELIVERY_TOLERANCE=#{ew.entity.underdeliveryTolerance}
+ AND OVERDELIVERY_TOLERANCE=#{ew.entity.overdeliveryTolerance}
+ AND UNLIMITED_OVERDELIVERY=#{ew.entity.unlimitedOverdelivery}
+ AND MINIMUM_DELIVERY_QTY=#{ew.entity.minimumDeliveryQty}
+ AND MAXIMUM_DELIVERY_QTY=#{ew.entity.maximumDeliveryQty}
+ AND TOLERANCE_DEFINED_IN=#{ew.entity.toleranceDefinedIn}
+
+
+ ${ew.sqlSegment}
+
+
+
+
+ ${ew.sqlSegment}
+
+
+
+
+
+ DELETE FROM SHOP_ORDER
+
+
+
+
+ ${k} = #{cm[${k}]}
+
+
+
+
+
+
+
+ DELETE FROM SHOP_ORDER
+
+
+
+
+ HANDLE=#{ew.entity.handle}
+
+ AND CHANGE_STAMP=#{ew.entity.changeStamp}
+ AND SITE=#{ew.entity.site}
+ AND SHOP_ORDER=#{ew.entity.shopOrder}
+ AND STATUS_BO=#{ew.entity.statusBo}
+ AND PRIORITY=#{ew.entity.priority}
+ AND PLANNED_WORK_CENTER_BO=#{ew.entity.plannedWorkCenterBo}
+ AND PLANNED_ITEM_BO=#{ew.entity.plannedItemBo}
+ AND PLANNED_BOM_BO=#{ew.entity.plannedBomBo}
+ AND PLANNED_ROUTER_BO=#{ew.entity.plannedRouterBo}
+ AND ITEM_BO=#{ew.entity.itemBo}
+ AND BOM_BO=#{ew.entity.bomBo}
+ AND ROUTER_BO=#{ew.entity.routerBo}
+ AND QTY_TO_BUILD=#{ew.entity.qtyToBuild}
+ AND QTY_ORDERED=#{ew.entity.qtyOrdered}
+ AND QTY_RELEASED=#{ew.entity.qtyReleased}
+ AND RELEASED_DATE=#{ew.entity.releasedDate}
+ AND PLANNED_START_DATE=#{ew.entity.plannedStartDate}
+ AND PLANNED_COMP_DATE=#{ew.entity.plannedCompDate}
+ AND SCHEDULED_START_DATE=#{ew.entity.scheduledStartDate}
+ AND SCHEDULED_COMP_DATE=#{ew.entity.scheduledCompDate}
+ AND ACTUAL_START_DATE=#{ew.entity.actualStartDate}
+ AND ACTUAL_COMP_DATE=#{ew.entity.actualCompDate}
+ AND QTY_DONE=#{ew.entity.qtyDone}
+ AND QTY_SCRAPPED=#{ew.entity.qtyScrapped}
+ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}
+ AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
+ AND CUSTOMER=#{ew.entity.customer}
+ AND CUSTOMER_ORDER=#{ew.entity.customerOrder}
+ AND RMA_SFC_DATA_TYPE_BO=#{ew.entity.rmaSfcDataTypeBo}
+ AND RMA_SHOP_ORDER_DATA_TYPE_BO=#{ew.entity.rmaShopOrderDataTypeBo}
+ AND ORIGINAL_STATUS_BO=#{ew.entity.originalStatusBo}
+ AND TRANSFER_SITE=#{ew.entity.transferSite}
+ AND TRANSFER_TYPE=#{ew.entity.transferType}
+ AND LCC_BO=#{ew.entity.lccBo}
+ AND SHOP_ORDER_TYPE_BO=#{ew.entity.shopOrderTypeBo}
+ AND HOLD_ID=#{ew.entity.holdId}
+ AND END_UNIT_NUMBER=#{ew.entity.endUnitNumber}
+ AND REQ_SERIAL_CHANGE=#{ew.entity.reqSerialChange}
+ AND COLLECT_PARENT_SERIAL=#{ew.entity.collectParentSerial}
+ AND BATCH_NUMBER=#{ew.entity.batchNumber}
+ AND ERP_ORDER=#{ew.entity.erpOrder}
+ AND ERP_PRODUCTION_VERSION=#{ew.entity.erpProductionVersion}
+ AND ERP_UNIT_OF_MEASURE=#{ew.entity.erpUnitOfMeasure}
+ AND PARTITION_DATE=#{ew.entity.partitionDate}
+ AND INSPECTION_LOT=#{ew.entity.inspectionLot}
+ AND INSPECTION_GROUP_SIZE=#{ew.entity.inspectionGroupSize}
+ AND ERP_PUTAWAY_STORLOC=#{ew.entity.erpPutawayStorloc}
+ AND WAREHOUSE_NUMBER=#{ew.entity.warehouseNumber}
+ AND UNDERDELIVERY_TOLERANCE=#{ew.entity.underdeliveryTolerance}
+ AND OVERDELIVERY_TOLERANCE=#{ew.entity.overdeliveryTolerance}
+ AND UNLIMITED_OVERDELIVERY=#{ew.entity.unlimitedOverdelivery}
+ AND MINIMUM_DELIVERY_QTY=#{ew.entity.minimumDeliveryQty}
+ AND MAXIMUM_DELIVERY_QTY=#{ew.entity.maximumDeliveryQty}
+ AND TOLERANCE_DEFINED_IN=#{ew.entity.toleranceDefinedIn}
+
+
+ ${ew.sqlSegment}
+
+
+
+
+ ${ew.sqlSegment}
+
+
+
+
+
+
diff --git a/meapi/src/main/resources/mapper/WorkCenterMapper.xml b/meapi/src/main/resources/mapper/WorkCenterMapper.xml
index 3ee6311e..78dfa267 100644
--- a/meapi/src/main/resources/mapper/WorkCenterMapper.xml
+++ b/meapi/src/main/resources/mapper/WorkCenterMapper.xml
@@ -30,6 +30,10 @@
HANDLE, CHANGE_STAMP, SITE, WORK_CENTER, ROUTER_BO, CAN_BE_RELEASED_TO, WC_CATEGORY, STATUS_BO, WC_TYPE, ASSIGNMENT_ENFORCEMENT, CREATED_DATE_TIME, MODIFIED_DATE_TIME, ERP_INTERNAL_ID, IS_ERP_WORK_CENTER, ERP_WORK_CENTER, ERP_CAPACITY_CATEGORY, PRODUCTION_SUPPLY_AREA, STANDARD_VALUE_KEY_BO
+
+ W.HANDLE, W.CHANGE_STAMP, W.SITE, W.WORK_CENTER, WT.DESCRIPTION, W.ROUTER_BO, W.CAN_BE_RELEASED_TO, W.WC_CATEGORY, W.STATUS_BO, W.WC_TYPE, W.ASSIGNMENT_ENFORCEMENT, W.CREATED_DATE_TIME, W.MODIFIED_DATE_TIME, W.ERP_INTERNAL_ID, W.IS_ERP_WORK_CENTER, ERP_WORK_CENTER, ERP_CAPACITY_CATEGORY, W.PRODUCTION_SUPPLY_AREA, W.STANDARD_VALUE_KEY_BO
+
+