From 96369b1a62a2218dfa27ef7dbe3e8c25649e2ed9 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Thu, 12 Aug 2021 16:01:40 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BA=A7=E5=89=8D=E5=87=86=E5=A4=87?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A3=80=E7=B4=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/mapper/ProdReadyTaskMapper.java | 2 +- .../impl/ProdReadyTaskServiceImpl.java | 8 +- .../resources/mapper/ProdReadyTaskMapper.xml | 1 + .../controller/ItemBatchController.java | 28 +- .../mesnac/meapi/mapper/UserGroupMapper.java | 1 + .../meapi/service/UserGroupService.java | 2 + .../service/impl/UserGroupServiceImpl.java | 7 +- .../main/resources/mapper/UserGroupMapper.xml | 5 + .../controller/AccessoryLogController.java | 128 +++++ .../production/mapper/AccessoryLogMapper.java | 18 + .../mesnac/production/model/AccessoryLog.java | 280 ++++++++++ .../service/AccessoryLogService.java | 28 + .../service/impl/AccessoryLogServiceImpl.java | 46 ++ .../service/impl/PodTemplateServiceImpl.java | 4 +- .../resources/mapper/AccessoryLogMapper.xml | 482 ++++++++++++++++++ 15 files changed, 1025 insertions(+), 15 deletions(-) create mode 100644 production/src/main/java/com/foreverwin/mesnac/production/controller/AccessoryLogController.java create mode 100644 production/src/main/java/com/foreverwin/mesnac/production/mapper/AccessoryLogMapper.java create mode 100644 production/src/main/java/com/foreverwin/mesnac/production/model/AccessoryLog.java create mode 100644 production/src/main/java/com/foreverwin/mesnac/production/service/AccessoryLogService.java create mode 100644 production/src/main/java/com/foreverwin/mesnac/production/service/impl/AccessoryLogServiceImpl.java create mode 100644 production/src/main/resources/mapper/AccessoryLogMapper.xml diff --git a/common/src/main/java/com/foreverwin/mesnac/common/mapper/ProdReadyTaskMapper.java b/common/src/main/java/com/foreverwin/mesnac/common/mapper/ProdReadyTaskMapper.java index 1110e9c9..d061af62 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/mapper/ProdReadyTaskMapper.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/mapper/ProdReadyTaskMapper.java @@ -20,7 +20,7 @@ import java.util.Map; @Repository public interface ProdReadyTaskMapper extends BaseMapper { - List getTaskList(@Param("entity")ProdReadyTask prodReadyTask, @Param("locale") String locale); + List getTaskList(@Param("entity")ProdReadyTask prodReadyTask, @Param("locale") String locale,@Param("admin") Integer admin,@Param("user") String user); ProdReadyTask loadProExecute(@Param("site")String site, @Param("taskBo")String taskBo, @Param("locale") String language); diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java index 5bba7756..c9dbc86f 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java @@ -23,6 +23,7 @@ import com.foreverwin.mesnac.common.util.ActiveMQUtil; import com.foreverwin.mesnac.common.util.DateUtil; import com.foreverwin.mesnac.common.util.StringUtil; import com.foreverwin.mesnac.meapi.dto.BomComponentDto; +import com.foreverwin.mesnac.meapi.mapper.UserGroupMapper; import com.foreverwin.mesnac.meapi.mapper.WorkCenterMapper; import com.foreverwin.mesnac.meapi.model.*; import com.foreverwin.mesnac.meapi.service.*; @@ -82,6 +83,8 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl getTaskList(ProdReadyTask prodReadyTask) { - return prodReadyTaskMapper.getTaskList(prodReadyTask, LocaleContextHolder.getLocale().getLanguage()); + String user = CommonMethods.getUser(); + String site = CommonMethods.getSite(); + Integer admin = userGroupMapper.getUserGroupByUser(HandleEnum.USER.getHandle(site, user), new UserGroupBOHandle(site, "ADMINISTRATORS").getValue()); + return prodReadyTaskMapper.getTaskList(prodReadyTask, LocaleContextHolder.getLocale().getLanguage(),admin,user); } @Override diff --git a/common/src/main/resources/mapper/ProdReadyTaskMapper.xml b/common/src/main/resources/mapper/ProdReadyTaskMapper.xml index 662c74e7..e0d8ccc8 100644 --- a/common/src/main/resources/mapper/ProdReadyTaskMapper.xml +++ b/common/src/main/resources/mapper/ProdReadyTaskMapper.xml @@ -637,6 +637,7 @@ LEFT JOIN ITEM_T ITT ON ITT.ITEM_BO = I.HANDLE AND ITT.LOCALE =#{locale} JOIN RESRCE RES ON RES.RESRCE = zprt.RESRCE AND RES.SITE = zprt.SITE WHERE ZPRT.SITE=#{entity.site} + AND ZSD.EMPLOYEE LIKE '%${user}%' AND ZPRT.WORK_CENTER=#{entity.workCenter} AND ZPRT.RESRCE=#{entity.resrce} AND ZSD.DISPATCH_NO=#{entity.dispatchNo} diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ItemBatchController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ItemBatchController.java index 4270fdc0..69b4277c 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ItemBatchController.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ItemBatchController.java @@ -1,24 +1,24 @@ package com.foreverwin.mesnac.dispatch.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.foreverwin.mesnac.common.erp.ZprodordconfStruIn; import com.foreverwin.mesnac.common.erp.ZprodordconfStruOut; import com.foreverwin.mesnac.common.erp.holders.TableOfZprodordconfStruInHolder; import com.foreverwin.mesnac.common.erp.holders.TableOfZprodordconfStruOutHolder; import com.foreverwin.mesnac.common.util.ERPAPI; -import com.foreverwin.modular.core.util.R; -import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.mesnac.dispatch.model.ItemBatch; +import com.foreverwin.mesnac.dispatch.service.ItemBatchService; 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 com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.R; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import com.foreverwin.mesnac.dispatch.service.ItemBatchService; -import com.foreverwin.mesnac.dispatch.model.ItemBatch; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; import java.math.BigDecimal; -import java.util.List; /** * @@ -32,6 +32,14 @@ public class ItemBatchController { @Autowired public ItemBatchService itemBatchService; + @ResponseBody + @GetMapping("/getItemBatch") + public R getItemBatch(ItemBatch itemBatch){ + QueryWrapper queryWrapper=new QueryWrapper<>(); + itemBatch.setSite(CommonMethods.getSite()); + queryWrapper.setEntity(itemBatch); + return R.ok(itemBatchService.list(queryWrapper)); + } /** * 分页查询数据 * diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java index b6259730..2fe80980 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java @@ -26,4 +26,5 @@ public interface UserGroupMapper extends BaseMapper { UserGroup getCustomFieldByGroup(@Param("site")String site, @Param("userGroup")String userGroup); + Integer getUserGroupByUser(@Param("userBO")String userBO,@Param("userGroupBO")String userGroupBO); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/UserGroupService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/UserGroupService.java index e5f1a6ba..dfcf201a 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/UserGroupService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/UserGroupService.java @@ -25,4 +25,6 @@ public interface UserGroupService extends IService { IPage selectPage(FrontPage frontPage, UserGroup userGroup); List selectList(UserGroup userGroup); + + Integer getUserGroupByUser(String userBO,String userGroupBO); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/UserGroupServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/UserGroupServiceImpl.java index ddb7b841..4207fb3d 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/UserGroupServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/UserGroupServiceImpl.java @@ -12,9 +12,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import java.util.List; + /** *

- * 服务实现类 + * 服务实现类 *

* * @author robert @@ -42,5 +43,9 @@ public class UserGroupServiceImpl extends ServiceImpl + + diff --git a/production/src/main/java/com/foreverwin/mesnac/production/controller/AccessoryLogController.java b/production/src/main/java/com/foreverwin/mesnac/production/controller/AccessoryLogController.java new file mode 100644 index 00000000..6113085f --- /dev/null +++ b/production/src/main/java/com/foreverwin/mesnac/production/controller/AccessoryLogController.java @@ -0,0 +1,128 @@ +package com.foreverwin.mesnac.production.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.production.model.AccessoryLog; +import com.foreverwin.mesnac.production.service.AccessoryLogService; +import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.R; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * + * @author Philip + * @since 2021-08-12 + */ +@RestController +@RequestMapping("/Z-ACCESSORY-LOG") +public class AccessoryLogController { + + @Autowired + public AccessoryLogService accessoryLogService; + + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getAccessoryLogById(@PathVariable String id) { + return R.ok( accessoryLogService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getAccessoryLogList(AccessoryLog accessoryLog){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(accessoryLog); + result = accessoryLogService.list(queryWrapper); + return R.ok(result); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, AccessoryLog accessoryLog){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(accessoryLog); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(AccessoryLog::getHandle, frontPage.getGlobalQuery()) + .or().like(AccessoryLog::getSite, frontPage.getGlobalQuery()) + .or().like(AccessoryLog::getWorkCenter, frontPage.getGlobalQuery()) + .or().like(AccessoryLog::getShopOrder, frontPage.getGlobalQuery()) + .or().like(AccessoryLog::getSfc, frontPage.getGlobalQuery()) + .or().like(AccessoryLog::getOperation, frontPage.getGlobalQuery()) + .or().like(AccessoryLog::getStepId, frontPage.getGlobalQuery()) + .or().like(AccessoryLog::getResrce, frontPage.getGlobalQuery()) + .or().like(AccessoryLog::getLabel, frontPage.getGlobalQuery()) + .or().like(AccessoryLog::getBatch, frontPage.getGlobalQuery()) + .or().like(AccessoryLog::getItem, frontPage.getGlobalQuery()) + .or().like(AccessoryLog::getRevision, frontPage.getGlobalQuery()) + .or().like(AccessoryLog::getCreateUser, frontPage.getGlobalQuery()) + ); + } + result = accessoryLogService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param accessoryLog 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping + public R save(@RequestBody AccessoryLog accessoryLog) { + return R.ok(accessoryLogService.save(accessoryLog)); + } + + /** + * 修改 + * @param accessoryLog 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping + public R updateById(@RequestBody AccessoryLog accessoryLog) { + return R.ok(accessoryLogService.updateById(accessoryLog)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(accessoryLogService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(accessoryLogService.removeByIds(ids)); + } +} \ No newline at end of file diff --git a/production/src/main/java/com/foreverwin/mesnac/production/mapper/AccessoryLogMapper.java b/production/src/main/java/com/foreverwin/mesnac/production/mapper/AccessoryLogMapper.java new file mode 100644 index 00000000..980b27ce --- /dev/null +++ b/production/src/main/java/com/foreverwin/mesnac/production/mapper/AccessoryLogMapper.java @@ -0,0 +1,18 @@ +package com.foreverwin.mesnac.production.mapper; + +import com.foreverwin.mesnac.production.model.AccessoryLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * 辅料使用记录表 Mapper 接口 + *

+ * + * @author Philip + * @since 2021-08-12 + */ +@Repository +public interface AccessoryLogMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/production/src/main/java/com/foreverwin/mesnac/production/model/AccessoryLog.java b/production/src/main/java/com/foreverwin/mesnac/production/model/AccessoryLog.java new file mode 100644 index 00000000..a6f19ad3 --- /dev/null +++ b/production/src/main/java/com/foreverwin/mesnac/production/model/AccessoryLog.java @@ -0,0 +1,280 @@ +package com.foreverwin.mesnac.production.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 Philip + * @since 2021-08-12 + */ + +@TableName("Z_ACCESSORY_LOG") + +public class AccessoryLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "HANDLE", type = IdType.INPUT) + private String handle; + /** + * 站点 + */ + @TableField("SITE") + private String site; + /** + * 车间 + */ + @TableField("WORK_CENTER") + private String workCenter; + /** + * 工单 + */ + @TableField("SHOP_ORDER") + private String shopOrder; + /** + * 产品条码 + */ + @TableField("SFC") + private String sfc; + /** + * 工序 + */ + @TableField("OPERATION") + private String operation; + /** + * 步骤 + */ + @TableField("STEP_ID") + private String stepId; + /** + * 资源 + */ + @TableField("RESRCE") + private String resrce; + /** + * 标签 + */ + @TableField("LABEL") + private String label; + /** + * 批次 + */ + @TableField("BATCH") + private String batch; + /** + * 物料 + */ + @TableField("ITEM") + private String item; + /** + * 物料版本 + */ + @TableField("REVISION") + private String revision; + /** + * 使用数量 + */ + @TableField("QTY") + private Double qty; + /** + * 创建人 + */ + @TableField("CREATE_USER") + private String createUser; + /** + * 创建时间 + */ + @TableField("CREATED_DATE_TIME") + private LocalDateTime createdDateTime; + + + 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 getWorkCenter() { + return workCenter; + } + + public void setWorkCenter(String workCenter) { + this.workCenter = workCenter; + } + + public String getShopOrder() { + return shopOrder; + } + + public void setShopOrder(String shopOrder) { + this.shopOrder = shopOrder; + } + + public String getSfc() { + return sfc; + } + + public void setSfc(String sfc) { + this.sfc = sfc; + } + + public String getOperation() { + return operation; + } + + public void setOperation(String operation) { + this.operation = operation; + } + + public String getStepId() { + return stepId; + } + + public void setStepId(String stepId) { + this.stepId = stepId; + } + + public String getResrce() { + return resrce; + } + + public void setResrce(String resrce) { + this.resrce = resrce; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public String getBatch() { + return batch; + } + + public void setBatch(String batch) { + this.batch = batch; + } + + public String getItem() { + return item; + } + + public void setItem(String item) { + this.item = item; + } + + public String getRevision() { + return revision; + } + + public void setRevision(String revision) { + this.revision = revision; + } + + public Double getQty() { + return qty; + } + + public void setQty(Double qty) { + this.qty = qty; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public LocalDateTime getCreatedDateTime() { + return createdDateTime; + } + + public void setCreatedDateTime(LocalDateTime createdDateTime) { + this.createdDateTime = createdDateTime; + } + +public static final String HANDLE = "HANDLE"; + +public static final String SITE = "SITE"; + +public static final String WORK_CENTER = "WORK_CENTER"; + +public static final String SHOP_ORDER = "SHOP_ORDER"; + +public static final String SFC = "SFC"; + +public static final String OPERATION = "OPERATION"; + +public static final String STEP_ID = "STEP_ID"; + +public static final String RESRCE = "RESRCE"; + +public static final String LABEL = "LABEL"; + +public static final String BATCH = "BATCH"; + +public static final String ITEM = "ITEM"; + +public static final String REVISION = "REVISION"; + +public static final String QTY = "QTY"; + +public static final String CREATE_USER = "CREATE_USER"; + +public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; + + + @Override + protected Serializable pkVal() { + return this.handle; + } + + @Override + public String toString() { + return "AccessoryLog{" + + "handle = " + handle + + ", site = " + site + + ", workCenter = " + workCenter + + ", shopOrder = " + shopOrder + + ", sfc = " + sfc + + ", operation = " + operation + + ", stepId = " + stepId + + ", resrce = " + resrce + + ", label = " + label + + ", batch = " + batch + + ", item = " + item + + ", revision = " + revision + + ", qty = " + qty + + ", createUser = " + createUser + + ", createdDateTime = " + createdDateTime + + "}"; + } +} \ No newline at end of file diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/AccessoryLogService.java b/production/src/main/java/com/foreverwin/mesnac/production/service/AccessoryLogService.java new file mode 100644 index 00000000..d2da0aaa --- /dev/null +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/AccessoryLogService.java @@ -0,0 +1,28 @@ +package com.foreverwin.mesnac.production.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.production.model.AccessoryLog; +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.modular.core.util.FrontPage; + +import java.util.List; + +/** + *

+ * 辅料使用记录表 服务类 + *

+ * + * @author Philip + * @since 2021-08-12 + */ +public interface AccessoryLogService extends IService { + + /** + * 分页查询 + * @param frontPage + * @return + */ + IPage selectPage(FrontPage frontPage, AccessoryLog accessoryLog); + + List selectList(AccessoryLog accessoryLog); +} \ No newline at end of file diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/AccessoryLogServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/AccessoryLogServiceImpl.java new file mode 100644 index 00000000..4df573e1 --- /dev/null +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/AccessoryLogServiceImpl.java @@ -0,0 +1,46 @@ +package com.foreverwin.mesnac.production.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.production.model.AccessoryLog; +import com.foreverwin.mesnac.production.mapper.AccessoryLogMapper; +import com.foreverwin.mesnac.production.service.AccessoryLogService; +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 Philip + * @since 2021-08-12 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class AccessoryLogServiceImpl extends ServiceImpl implements AccessoryLogService { + + + @Autowired + private AccessoryLogMapper accessoryLogMapper; + + @Override + public IPage selectPage(FrontPage frontPage, AccessoryLog accessoryLog) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(accessoryLog); + return super.page(frontPage.getPagePlus(), queryWrapper); + } + + @Override + public List selectList(AccessoryLog accessoryLog) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(accessoryLog); + return super.list(queryWrapper); + } + + +} \ No newline at end of file diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java index 0fb83bc6..1f9e1c00 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java @@ -332,7 +332,7 @@ public class PodTemplateServiceImpl implements PodTemplateService { } } //报工 - //sendErp(postMapList); + sendErp(postMapList); } public void materialConsumption(String site, String operation, String sfcBo, String stepId, String resource) { @@ -468,7 +468,7 @@ public class PodTemplateServiceImpl implements PodTemplateService { struOut.setAufnr(""); struOut.setVornr(""); struOut.setAueru("1"); - struOut.setLmnga(new BigDecimal(1)); + struOut.setLmnga(BigDecimal.ZERO); struOut.setRet(""); struOut.setMsg(""); outs[0] = struOut; diff --git a/production/src/main/resources/mapper/AccessoryLogMapper.xml b/production/src/main/resources/mapper/AccessoryLogMapper.xml new file mode 100644 index 00000000..d1c7e4ab --- /dev/null +++ b/production/src/main/resources/mapper/AccessoryLogMapper.xml @@ -0,0 +1,482 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + HANDLE, SITE, WORK_CENTER, SHOP_ORDER, SFC, OPERATION, STEP_ID, RESRCE, LABEL, BATCH, ITEM, REVISION, QTY, CREATE_USER, CREATED_DATE_TIME + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO Z_ACCESSORY_LOG + + HANDLE, + SITE, + WORK_CENTER, + SHOP_ORDER, + SFC, + OPERATION, + STEP_ID, + RESRCE, + LABEL, + BATCH, + ITEM, + REVISION, + QTY, + CREATE_USER, + CREATED_DATE_TIME, + VALUES + + #{handle}, + #{site}, + #{workCenter}, + #{shopOrder}, + #{sfc}, + #{operation}, + #{stepId}, + #{resrce}, + #{label}, + #{batch}, + #{item}, + #{revision}, + #{qty}, + #{createUser}, + #{createdDateTime}, + + + + + INSERT INTO Z_ACCESSORY_LOG + + + VALUES + + #{handle}, + #{site}, + #{workCenter}, + #{shopOrder}, + #{sfc}, + #{operation}, + #{stepId}, + #{resrce}, + #{label}, + #{batch}, + #{item}, + #{revision}, + #{qty}, + #{createUser}, + #{createdDateTime}, + + + + + + UPDATE Z_ACCESSORY_LOG + SITE=#{et.site}, + WORK_CENTER=#{et.workCenter}, + SHOP_ORDER=#{et.shopOrder}, + SFC=#{et.sfc}, + OPERATION=#{et.operation}, + STEP_ID=#{et.stepId}, + RESRCE=#{et.resrce}, + LABEL=#{et.label}, + BATCH=#{et.batch}, + ITEM=#{et.item}, + REVISION=#{et.revision}, + QTY=#{et.qty}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + + + + + UPDATE Z_ACCESSORY_LOG + SITE=#{et.site}, + WORK_CENTER=#{et.workCenter}, + SHOP_ORDER=#{et.shopOrder}, + SFC=#{et.sfc}, + OPERATION=#{et.operation}, + STEP_ID=#{et.stepId}, + RESRCE=#{et.resrce}, + LABEL=#{et.label}, + BATCH=#{et.batch}, + ITEM=#{et.item}, + REVISION=#{et.revision}, + QTY=#{et.qty}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + + + + + UPDATE Z_ACCESSORY_LOG + SITE=#{et.site}, + WORK_CENTER=#{et.workCenter}, + SHOP_ORDER=#{et.shopOrder}, + SFC=#{et.sfc}, + OPERATION=#{et.operation}, + STEP_ID=#{et.stepId}, + RESRCE=#{et.resrce}, + LABEL=#{et.label}, + BATCH=#{et.batch}, + ITEM=#{et.item}, + REVISION=#{et.revision}, + QTY=#{et.qty}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + + + + + HANDLE=#{ew.entity.handle} + AND SITE=#{ew.entity.site} + AND WORK_CENTER=#{ew.entity.workCenter} + AND SHOP_ORDER=#{ew.entity.shopOrder} + AND SFC=#{ew.entity.sfc} + AND OPERATION=#{ew.entity.operation} + AND STEP_ID=#{ew.entity.stepId} + AND RESRCE=#{ew.entity.resrce} + AND LABEL=#{ew.entity.label} + AND BATCH=#{ew.entity.batch} + AND ITEM=#{ew.entity.item} + AND REVISION=#{ew.entity.revision} + AND QTY=#{ew.entity.qty} + AND CREATE_USER=#{ew.entity.createUser} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + DELETE FROM Z_ACCESSORY_LOG WHERE HANDLE=#{handle} + + + + DELETE FROM Z_ACCESSORY_LOG + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM Z_ACCESSORY_LOG + + + + + HANDLE=#{ew.entity.handle} + + AND SITE=#{ew.entity.site} + AND WORK_CENTER=#{ew.entity.workCenter} + AND SHOP_ORDER=#{ew.entity.shopOrder} + AND SFC=#{ew.entity.sfc} + AND OPERATION=#{ew.entity.operation} + AND STEP_ID=#{ew.entity.stepId} + AND RESRCE=#{ew.entity.resrce} + AND LABEL=#{ew.entity.label} + AND BATCH=#{ew.entity.batch} + AND ITEM=#{ew.entity.item} + AND REVISION=#{ew.entity.revision} + AND QTY=#{ew.entity.qty} + AND CREATE_USER=#{ew.entity.createUser} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + DELETE FROM Z_ACCESSORY_LOG WHERE HANDLE IN ( + #{item} + ) + + + + From 43db6a338504a90fa155ad43ee5ef2ed9aba2d5e Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Thu, 12 Aug 2021 16:58:25 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=9F=A5=E6=89=BE=E4=B8=8B=E5=B7=A5?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProdReadyTaskServiceImpl.java | 21 +- .../service/impl/InterfaceServiceImpl.java | 2 +- .../controller/RouterStepController.java | 135 +++++ .../mesnac/meapi/dto/RouterStepDto.java | 33 ++ .../mesnac/meapi/mapper/RouterStepMapper.java | 23 + .../mesnac/meapi/model/RouterStep.java | 284 ++++++++++ .../meapi/service/RouterStepService.java | 31 ++ .../service/impl/RouterStepServiceImpl.java | 53 ++ .../resources/mapper/RouterStepMapper.xml | 504 ++++++++++++++++++ 9 files changed, 1084 insertions(+), 2 deletions(-) create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/RouterStepController.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/RouterStepDto.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/RouterStepMapper.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/model/RouterStep.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterStepService.java create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterStepServiceImpl.java create mode 100644 meapi/src/main/resources/mapper/RouterStepMapper.xml diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java index c9dbc86f..d88b0af9 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java @@ -23,6 +23,7 @@ import com.foreverwin.mesnac.common.util.ActiveMQUtil; import com.foreverwin.mesnac.common.util.DateUtil; import com.foreverwin.mesnac.common.util.StringUtil; import com.foreverwin.mesnac.meapi.dto.BomComponentDto; +import com.foreverwin.mesnac.meapi.dto.RouterStepDto; import com.foreverwin.mesnac.meapi.mapper.UserGroupMapper; import com.foreverwin.mesnac.meapi.mapper.WorkCenterMapper; import com.foreverwin.mesnac.meapi.model.*; @@ -77,6 +78,10 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl stepOperationList = routerStepService.findRouterOperationByRouterBo(site, router.getHandle()); + for (int i = 0; i < stepOperationList.size(); i++) { + RouterStepDto stepOperation = stepOperationList.get(i); + if (stepOperation.getStepId().equals(prodReadyTask.getStepId())) { + seq = i; + } + } + if (seq != stepOperationList.size()-1) { + RouterStepDto stepOperation = stepOperationList.get(seq + 1); + labelPrintDto.setOperation(stepOperation.getOperationDesc()); + + } labelPrintDtoList.add(labelPrintDto); printData = JSON.toJSONString(labelPrintDtoList); //打印记录 diff --git a/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java b/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java index d0dbe19b..62e78053 100644 --- a/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java +++ b/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java @@ -1,7 +1,6 @@ package com.foreverwin.mesnac.integration.service.impl; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.foreverwin.mesnac.common.constant.Constants; import com.foreverwin.mesnac.common.constant.CustomFieldConstant; import com.foreverwin.mesnac.common.dto.LabelPrintDto; @@ -22,6 +21,7 @@ import com.sap.me.common.MaterialType; import com.sap.me.common.ObjectReference; import com.sap.me.common.ProcurementType; import com.sap.me.demand.*; +import com.sap.me.productdefinition.RouterStep; import com.sap.me.productdefinition.*; import com.sap.me.production.ChangeProductionServiceInterface; import com.visiprise.globalization.DateGlobalizationServiceInterface; diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/RouterStepController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/RouterStepController.java new file mode 100644 index 00000000..5d335779 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/RouterStepController.java @@ -0,0 +1,135 @@ +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.RouterStepService; +import com.foreverwin.mesnac.meapi.model.RouterStep; +import java.util.List; + +/** + * + * @author Philip + * @since 2021-08-12 + */ +@RestController +@RequestMapping("/ROUTER-STEP") +public class RouterStepController { + + @Autowired + public RouterStepService routerStepService; + + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getRouterStepById(@PathVariable String id) { + return R.ok( routerStepService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getRouterStepList(RouterStep routerStep){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(routerStep); + result = routerStepService.list(queryWrapper); + return R.ok(result); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, RouterStep routerStep){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(routerStep); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(RouterStep::getHandle, frontPage.getGlobalQuery()) + .or().like(RouterStep::getRouterBo, frontPage.getGlobalQuery()) + .or().like(RouterStep::getStepId, frontPage.getGlobalQuery()) + .or().like(RouterStep::getDescription, frontPage.getGlobalQuery()) + .or().like(RouterStep::getRework, frontPage.getGlobalQuery()) + .or().like(RouterStep::getQueueDecisionType, frontPage.getGlobalQuery()) + .or().like(RouterStep::getRouterCompGbo, frontPage.getGlobalQuery()) + .or().like(RouterStep::getReportingStep, frontPage.getGlobalQuery()) + .or().like(RouterStep::getReportingCenterBo, frontPage.getGlobalQuery()) + .or().like(RouterStep::getTabularStepType, frontPage.getGlobalQuery()) + .or().like(RouterStep::getScrapReportingStep, frontPage.getGlobalQuery()) + .or().like(RouterStep::getIsLastReportingStep, frontPage.getGlobalQuery()) + .or().like(RouterStep::getErpSequence, frontPage.getGlobalQuery()) + .or().like(RouterStep::getErpControlKeyBo, frontPage.getGlobalQuery()) + .or().like(RouterStep::getErpWorkCenterBo, frontPage.getGlobalQuery()) + .or().like(RouterStep::getErpInspectionComplete, frontPage.getGlobalQuery()) + .or().like(RouterStep::getErpOperation, frontPage.getGlobalQuery()) + .or().like(RouterStep::getOperationActivityId, frontPage.getGlobalQuery()) + ); + } + result = routerStepService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param routerStep 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping + public R save(@RequestBody RouterStep routerStep) { + return R.ok(routerStepService.save(routerStep)); + } + + /** + * 修改 + * @param routerStep 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping + public R updateById(@RequestBody RouterStep routerStep) { + return R.ok(routerStepService.updateById(routerStep)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(routerStepService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(routerStepService.removeByIds(ids)); + } +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/RouterStepDto.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/RouterStepDto.java new file mode 100644 index 00000000..dcb43d5a --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/RouterStepDto.java @@ -0,0 +1,33 @@ +package com.foreverwin.mesnac.meapi.dto; + +import com.foreverwin.mesnac.meapi.model.RouterStep; + +public class RouterStepDto extends RouterStep { + private String operation; + private String operationBo; + private String operationDesc; + + public String getOperation() { + return operation; + } + + public void setOperation(String operation) { + this.operation = operation; + } + + public String getOperationBo() { + return operationBo; + } + + public void setOperationBo(String operationBo) { + this.operationBo = operationBo; + } + + public String getOperationDesc() { + return operationDesc; + } + + public void setOperationDesc(String operationDesc) { + this.operationDesc = operationDesc; + } +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/RouterStepMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/RouterStepMapper.java new file mode 100644 index 00000000..53cef2df --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/RouterStepMapper.java @@ -0,0 +1,23 @@ +package com.foreverwin.mesnac.meapi.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.foreverwin.mesnac.meapi.dto.RouterStepDto; +import com.foreverwin.mesnac.meapi.model.RouterStep; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author Philip + * @since 2021-08-12 + */ +@Repository +public interface RouterStepMapper extends BaseMapper { + + List findRouterOperationByRouterBo(@Param("site") String site, @Param("routerBo") String routerBO, @Param("locale")String locale); +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/RouterStep.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/RouterStep.java new file mode 100644 index 00000000..28884a2a --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/RouterStep.java @@ -0,0 +1,284 @@ +package com.foreverwin.mesnac.meapi.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author Philip + * @since 2021-08-12 + */ + +@TableName("ROUTER_STEP") + +public class RouterStep extends Model { + + private static final long serialVersionUID = 1L; + + @TableField("HANDLE") + private String handle; + @TableField("ROUTER_BO") + private String routerBo; + @TableField("STEP_ID") + private String stepId; + @TableField("DESCRIPTION") + private String description; + @TableField("REWORK") + private String rework; + @TableField("QUEUE_DECISION_TYPE") + private String queueDecisionType; + @TableField("ROUTER_COMP_GBO") + private String routerCompGbo; + @TableField("REPORTING_STEP") + private String reportingStep; + @TableField("SEQUENCE") + private Long sequence; + @TableField("REPORTING_CENTER_BO") + private String reportingCenterBo; + @TableField("TABULAR_STEP_TYPE") + private String tabularStepType; + @TableField("SCRAP_REPORTING_STEP") + private String scrapReportingStep; + @TableField("IS_LAST_REPORTING_STEP") + private String isLastReportingStep; + @TableField("ERP_SEQUENCE") + private String erpSequence; + @TableField("ERP_CONTROL_KEY_BO") + private String erpControlKeyBo; + @TableField("ERP_WORK_CENTER_BO") + private String erpWorkCenterBo; + @TableField("ERP_INSPECTION_COMPLETE") + private String erpInspectionComplete; + @TableField("ERP_OPERATION") + private String erpOperation; + @TableField("OPERATION_ACTIVITY_ID") + private String operationActivityId; + + + public String getHandle() { + return handle; + } + + public void setHandle(String handle) { + this.handle = handle; + } + + public String getRouterBo() { + return routerBo; + } + + public void setRouterBo(String routerBo) { + this.routerBo = routerBo; + } + + public String getStepId() { + return stepId; + } + + public void setStepId(String stepId) { + this.stepId = stepId; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getRework() { + return rework; + } + + public void setRework(String rework) { + this.rework = rework; + } + + public String getQueueDecisionType() { + return queueDecisionType; + } + + public void setQueueDecisionType(String queueDecisionType) { + this.queueDecisionType = queueDecisionType; + } + + public String getRouterCompGbo() { + return routerCompGbo; + } + + public void setRouterCompGbo(String routerCompGbo) { + this.routerCompGbo = routerCompGbo; + } + + public String getReportingStep() { + return reportingStep; + } + + public void setReportingStep(String reportingStep) { + this.reportingStep = reportingStep; + } + + public Long getSequence() { + return sequence; + } + + public void setSequence(Long sequence) { + this.sequence = sequence; + } + + public String getReportingCenterBo() { + return reportingCenterBo; + } + + public void setReportingCenterBo(String reportingCenterBo) { + this.reportingCenterBo = reportingCenterBo; + } + + public String getTabularStepType() { + return tabularStepType; + } + + public void setTabularStepType(String tabularStepType) { + this.tabularStepType = tabularStepType; + } + + public String getScrapReportingStep() { + return scrapReportingStep; + } + + public void setScrapReportingStep(String scrapReportingStep) { + this.scrapReportingStep = scrapReportingStep; + } + + public String getIsLastReportingStep() { + return isLastReportingStep; + } + + public void setIsLastReportingStep(String isLastReportingStep) { + this.isLastReportingStep = isLastReportingStep; + } + + public String getErpSequence() { + return erpSequence; + } + + public void setErpSequence(String erpSequence) { + this.erpSequence = erpSequence; + } + + public String getErpControlKeyBo() { + return erpControlKeyBo; + } + + public void setErpControlKeyBo(String erpControlKeyBo) { + this.erpControlKeyBo = erpControlKeyBo; + } + + public String getErpWorkCenterBo() { + return erpWorkCenterBo; + } + + public void setErpWorkCenterBo(String erpWorkCenterBo) { + this.erpWorkCenterBo = erpWorkCenterBo; + } + + public String getErpInspectionComplete() { + return erpInspectionComplete; + } + + public void setErpInspectionComplete(String erpInspectionComplete) { + this.erpInspectionComplete = erpInspectionComplete; + } + + public String getErpOperation() { + return erpOperation; + } + + public void setErpOperation(String erpOperation) { + this.erpOperation = erpOperation; + } + + public String getOperationActivityId() { + return operationActivityId; + } + + public void setOperationActivityId(String operationActivityId) { + this.operationActivityId = operationActivityId; + } + +public static final String HANDLE = "HANDLE"; + +public static final String ROUTER_BO = "ROUTER_BO"; + +public static final String STEP_ID = "STEP_ID"; + +public static final String DESCRIPTION = "DESCRIPTION"; + +public static final String REWORK = "REWORK"; + +public static final String QUEUE_DECISION_TYPE = "QUEUE_DECISION_TYPE"; + +public static final String ROUTER_COMP_GBO = "ROUTER_COMP_GBO"; + +public static final String REPORTING_STEP = "REPORTING_STEP"; + +public static final String SEQUENCE = "SEQUENCE"; + +public static final String REPORTING_CENTER_BO = "REPORTING_CENTER_BO"; + +public static final String TABULAR_STEP_TYPE = "TABULAR_STEP_TYPE"; + +public static final String SCRAP_REPORTING_STEP = "SCRAP_REPORTING_STEP"; + +public static final String IS_LAST_REPORTING_STEP = "IS_LAST_REPORTING_STEP"; + +public static final String ERP_SEQUENCE = "ERP_SEQUENCE"; + +public static final String ERP_CONTROL_KEY_BO = "ERP_CONTROL_KEY_BO"; + +public static final String ERP_WORK_CENTER_BO = "ERP_WORK_CENTER_BO"; + +public static final String ERP_INSPECTION_COMPLETE = "ERP_INSPECTION_COMPLETE"; + +public static final String ERP_OPERATION = "ERP_OPERATION"; + +public static final String OPERATION_ACTIVITY_ID = "OPERATION_ACTIVITY_ID"; + + + @Override + protected Serializable pkVal() { + return this.handle; + } + + @Override + public String toString() { + return "RouterStep{" + + "handle = " + handle + + ", routerBo = " + routerBo + + ", stepId = " + stepId + + ", description = " + description + + ", rework = " + rework + + ", queueDecisionType = " + queueDecisionType + + ", routerCompGbo = " + routerCompGbo + + ", reportingStep = " + reportingStep + + ", sequence = " + sequence + + ", reportingCenterBo = " + reportingCenterBo + + ", tabularStepType = " + tabularStepType + + ", scrapReportingStep = " + scrapReportingStep + + ", isLastReportingStep = " + isLastReportingStep + + ", erpSequence = " + erpSequence + + ", erpControlKeyBo = " + erpControlKeyBo + + ", erpWorkCenterBo = " + erpWorkCenterBo + + ", erpInspectionComplete = " + erpInspectionComplete + + ", erpOperation = " + erpOperation + + ", operationActivityId = " + operationActivityId + + "}"; + } +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterStepService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterStepService.java new file mode 100644 index 00000000..33fbb581 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterStepService.java @@ -0,0 +1,31 @@ +package com.foreverwin.mesnac.meapi.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.mesnac.meapi.dto.RouterStepDto; +import com.foreverwin.mesnac.meapi.model.RouterStep; +import com.foreverwin.modular.core.util.FrontPage; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author Philip + * @since 2021-08-12 + */ +public interface RouterStepService extends IService { + + /** + * 分页查询 + * @param frontPage + * @return + */ + IPage selectPage(FrontPage frontPage, RouterStep routerStep); + + List selectList(RouterStep routerStep); + + List findRouterOperationByRouterBo(String site, String handle); +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterStepServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterStepServiceImpl.java new file mode 100644 index 00000000..a9477ff9 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterStepServiceImpl.java @@ -0,0 +1,53 @@ +package com.foreverwin.mesnac.meapi.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.meapi.dto.RouterStepDto; +import com.foreverwin.mesnac.meapi.mapper.RouterStepMapper; +import com.foreverwin.mesnac.meapi.model.RouterStep; +import com.foreverwin.mesnac.meapi.service.RouterStepService; +import com.foreverwin.modular.core.util.FrontPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.i18n.LocaleContextHolder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +/** + *

+ * 服务实现类 + *

+ * + * @author Philip + * @since 2021-08-12 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class RouterStepServiceImpl extends ServiceImpl implements RouterStepService { + + + @Autowired + private RouterStepMapper routerStepMapper; + + @Override + public IPage selectPage(FrontPage frontPage, RouterStep routerStep) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(routerStep); + return super.page(frontPage.getPagePlus(), queryWrapper); + } + + @Override + public List selectList(RouterStep routerStep) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(routerStep); + return super.list(queryWrapper); + } + + @Override + public List findRouterOperationByRouterBo(String site, String routerBO) { + return routerStepMapper.findRouterOperationByRouterBo( site, routerBO, LocaleContextHolder.getLocale().getLanguage()); + } + + +} \ No newline at end of file diff --git a/meapi/src/main/resources/mapper/RouterStepMapper.xml b/meapi/src/main/resources/mapper/RouterStepMapper.xml new file mode 100644 index 00000000..d32fa1fd --- /dev/null +++ b/meapi/src/main/resources/mapper/RouterStepMapper.xml @@ -0,0 +1,504 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HANDLE, ROUTER_BO, STEP_ID, DESCRIPTION, REWORK, QUEUE_DECISION_TYPE, ROUTER_COMP_GBO, REPORTING_STEP, SEQUENCE, REPORTING_CENTER_BO, TABULAR_STEP_TYPE, SCRAP_REPORTING_STEP, IS_LAST_REPORTING_STEP, ERP_SEQUENCE, ERP_CONTROL_KEY_BO, ERP_WORK_CENTER_BO, ERP_INSPECTION_COMPLETE, ERP_OPERATION, OPERATION_ACTIVITY_ID + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO ROUTER_STEP + + HANDLE, + ROUTER_BO, + STEP_ID, + DESCRIPTION, + REWORK, + QUEUE_DECISION_TYPE, + ROUTER_COMP_GBO, + REPORTING_STEP, + SEQUENCE, + REPORTING_CENTER_BO, + TABULAR_STEP_TYPE, + SCRAP_REPORTING_STEP, + IS_LAST_REPORTING_STEP, + ERP_SEQUENCE, + ERP_CONTROL_KEY_BO, + ERP_WORK_CENTER_BO, + ERP_INSPECTION_COMPLETE, + ERP_OPERATION, + OPERATION_ACTIVITY_ID, + VALUES + + #{handle}, + #{routerBo}, + #{stepId}, + #{description}, + #{rework}, + #{queueDecisionType}, + #{routerCompGbo}, + #{reportingStep}, + #{sequence}, + #{reportingCenterBo}, + #{tabularStepType}, + #{scrapReportingStep}, + #{isLastReportingStep}, + #{erpSequence}, + #{erpControlKeyBo}, + #{erpWorkCenterBo}, + #{erpInspectionComplete}, + #{erpOperation}, + #{operationActivityId}, + + + + + INSERT INTO ROUTER_STEP + + + VALUES + + #{handle}, + #{routerBo}, + #{stepId}, + #{description}, + #{rework}, + #{queueDecisionType}, + #{routerCompGbo}, + #{reportingStep}, + #{sequence}, + #{reportingCenterBo}, + #{tabularStepType}, + #{scrapReportingStep}, + #{isLastReportingStep}, + #{erpSequence}, + #{erpControlKeyBo}, + #{erpWorkCenterBo}, + #{erpInspectionComplete}, + #{erpOperation}, + #{operationActivityId}, + + + + + + + + + + UPDATE ROUTER_STEP + HANDLE=#{et.handle}, + ROUTER_BO=#{et.routerBo}, + STEP_ID=#{et.stepId}, + DESCRIPTION=#{et.description}, + REWORK=#{et.rework}, + QUEUE_DECISION_TYPE=#{et.queueDecisionType}, + ROUTER_COMP_GBO=#{et.routerCompGbo}, + REPORTING_STEP=#{et.reportingStep}, + SEQUENCE=#{et.sequence}, + REPORTING_CENTER_BO=#{et.reportingCenterBo}, + TABULAR_STEP_TYPE=#{et.tabularStepType}, + SCRAP_REPORTING_STEP=#{et.scrapReportingStep}, + IS_LAST_REPORTING_STEP=#{et.isLastReportingStep}, + ERP_SEQUENCE=#{et.erpSequence}, + ERP_CONTROL_KEY_BO=#{et.erpControlKeyBo}, + ERP_WORK_CENTER_BO=#{et.erpWorkCenterBo}, + ERP_INSPECTION_COMPLETE=#{et.erpInspectionComplete}, + ERP_OPERATION=#{et.erpOperation}, + OPERATION_ACTIVITY_ID=#{et.operationActivityId}, + + + + + HANDLE=#{ew.entity.handle} + AND ROUTER_BO=#{ew.entity.routerBo} + AND STEP_ID=#{ew.entity.stepId} + AND DESCRIPTION=#{ew.entity.description} + AND REWORK=#{ew.entity.rework} + AND QUEUE_DECISION_TYPE=#{ew.entity.queueDecisionType} + AND ROUTER_COMP_GBO=#{ew.entity.routerCompGbo} + AND REPORTING_STEP=#{ew.entity.reportingStep} + AND SEQUENCE=#{ew.entity.sequence} + AND REPORTING_CENTER_BO=#{ew.entity.reportingCenterBo} + AND TABULAR_STEP_TYPE=#{ew.entity.tabularStepType} + AND SCRAP_REPORTING_STEP=#{ew.entity.scrapReportingStep} + AND IS_LAST_REPORTING_STEP=#{ew.entity.isLastReportingStep} + AND ERP_SEQUENCE=#{ew.entity.erpSequence} + AND ERP_CONTROL_KEY_BO=#{ew.entity.erpControlKeyBo} + AND ERP_WORK_CENTER_BO=#{ew.entity.erpWorkCenterBo} + AND ERP_INSPECTION_COMPLETE=#{ew.entity.erpInspectionComplete} + AND ERP_OPERATION=#{ew.entity.erpOperation} + AND OPERATION_ACTIVITY_ID=#{ew.entity.operationActivityId} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + + DELETE FROM ROUTER_STEP + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM ROUTER_STEP + + + + + HANDLE=#{ew.entity.handle} + + AND ROUTER_BO=#{ew.entity.routerBo} + AND STEP_ID=#{ew.entity.stepId} + AND DESCRIPTION=#{ew.entity.description} + AND REWORK=#{ew.entity.rework} + AND QUEUE_DECISION_TYPE=#{ew.entity.queueDecisionType} + AND ROUTER_COMP_GBO=#{ew.entity.routerCompGbo} + AND REPORTING_STEP=#{ew.entity.reportingStep} + AND SEQUENCE=#{ew.entity.sequence} + AND REPORTING_CENTER_BO=#{ew.entity.reportingCenterBo} + AND TABULAR_STEP_TYPE=#{ew.entity.tabularStepType} + AND SCRAP_REPORTING_STEP=#{ew.entity.scrapReportingStep} + AND IS_LAST_REPORTING_STEP=#{ew.entity.isLastReportingStep} + AND ERP_SEQUENCE=#{ew.entity.erpSequence} + AND ERP_CONTROL_KEY_BO=#{ew.entity.erpControlKeyBo} + AND ERP_WORK_CENTER_BO=#{ew.entity.erpWorkCenterBo} + AND ERP_INSPECTION_COMPLETE=#{ew.entity.erpInspectionComplete} + AND ERP_OPERATION=#{ew.entity.erpOperation} + AND OPERATION_ACTIVITY_ID=#{ew.entity.operationActivityId} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + + + From 7b8437d82ee7bd83c00b9dd007a6c967e68070e9 Mon Sep 17 00:00:00 2001 From: zpl Date: Thu, 12 Aug 2021 16:59:01 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equip/dto/ResourceInspectTaskDto.java | 10 ++++++++++ .../meapi/controller/NcGroupController.java | 17 +++++++++++++++++ .../mesnac/meapi/mapper/NcGroupMapper.java | 2 ++ .../mesnac/meapi/service/NcGroupService.java | 3 +++ .../meapi/service/impl/NcGroupServiceImpl.java | 10 ++++++++++ 5 files changed, 42 insertions(+) diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java b/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java index 5adea033..387878fe 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java @@ -52,6 +52,8 @@ public class ResourceInspectTaskDto implements Serializable { private LocalDateTime actualCompleteDate; /**执行人**/ private String executor; + /**执行人**/ + private String executorName; /**备注**/ private String remark; /**检索时间段的开始时间**/ @@ -324,6 +326,14 @@ public class ResourceInspectTaskDto implements Serializable { this.executor = executor; } + public String getExecutorName() { + return executorName; + } + + public void setExecutorName(String executorName) { + this.executorName = executorName; + } + public String getRemark() { return remark; } diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcGroupController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcGroupController.java index 4b3dff76..8f911cc0 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcGroupController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcGroupController.java @@ -32,6 +32,23 @@ public class NcGroupController { result = ncGroupService.selectPageByOperation(frontPage.getPagePlus(), frontPage.getGlobalQuery(),operation); return R.ok(result); } + + /** + * 根据工序查询不良代码组，不分页 + * @param operation + * @return + */ + @ResponseBody + @GetMapping("/selectPageByOperationNoPage") + public R selectPageByOperationNoPage(String operation){ + List result; + try{ + result = ncGroupService.selectPageByOperationNoPage(operation); + }catch (Exception e){ + return R.failed(e.getMessage()); + } + return R.ok(result); + } /** * 根据id查询 * diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcGroupMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcGroupMapper.java index 68be48f3..091e52e1 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcGroupMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcGroupMapper.java @@ -24,4 +24,6 @@ public interface NcGroupMapper extends BaseMapper { IPage selectPageByOperation(Page frontPage, @Param("site") String site, @Param("operationBO") String operationBO,@Param("globalQuery") String globalQuery); List findNgGroupByOperationBo(@Param("operation") Operation operation); + + List selectPageByOperation(@Param("site") String site, @Param("operationBO") String operationBO, @Param("globalQuery") Object o); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcGroupService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcGroupService.java index a4891d13..4079b0f3 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcGroupService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcGroupService.java @@ -30,5 +30,8 @@ public interface NcGroupService extends IService { IPage selectPageByOperation(Page pagePlus, String globalQuery, String operation); + List findNgGroupByOperationBo(Operation operation); + + List selectPageByOperationNoPage(String operation); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcGroupServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcGroupServiceImpl.java index 147ef90f..15e96f72 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcGroupServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcGroupServiceImpl.java @@ -70,4 +70,14 @@ public class NcGroupServiceImpl extends ServiceImpl impl return ncGroupMapper.findNgGroupByOperationBo(operation); } + @Override + public List selectPageByOperationNoPage(String operation) { + String site = CommonMethods.getSite(); + if (StringUtils.isBlank(operation)) { + throw new BaseException("工序不能为空"); + } + String operationBO = new OperationBOHandle(site, operation, "#").getValue(); + return ncGroupMapper.selectPageByOperation(site, operationBO, null); + } + } \ No newline at end of file From 45b103cdc578595cd3d4d5c135b837cca6f70af9 Mon Sep 17 00:00:00 2001 From: zpl Date: Thu, 12 Aug 2021 21:46:35 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8D=E5=90=88?= =?UTF-8?q?=E6=A0=BC=E4=BB=A3=E7=A0=81=E7=BB=84=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/meapi/controller/NcCodeController.java | 11 +++++++++++ .../mesnac/meapi/mapper/NcCodeMapper.java | 2 ++ .../mesnac/meapi/service/NcCodeService.java | 2 ++ .../meapi/service/impl/NcCodeServiceImpl.java | 9 +++++++++ meapi/src/main/resources/mapper/NcCodeMapper.xml | 15 +++++++++++++++ 5 files changed, 39 insertions(+) diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcCodeController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcCodeController.java index 951fc9b2..b55e1422 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcCodeController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcCodeController.java @@ -149,6 +149,17 @@ public class NcCodeController { public R findNcCodeByNcGroup(NcGroup ncGroup){ return R.ok(ncCodeService.findNcCodeByNcGroup(ncGroup)); } + + /** + * 根据不合格代码组查询不合格代码 + * @param ncGroup + * @return + */ + @GetMapping("/findNcCodeByNcGroupList") + public R findNcCodeByNcGroupList(String ncGroup){ + return R.ok(ncCodeService.findNcCodeByNcGroupList(ncGroup)); + } + } diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcCodeMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcCodeMapper.java index 638b8ae5..3f18c5ee 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcCodeMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcCodeMapper.java @@ -40,4 +40,6 @@ public interface NcCodeMapper extends BaseMapper { List findNcCodeDescriptionByNcCode(@Param("site")String site, @Param("locale")String locale, @Param("ncCode")String[] ncCode); + + List findNcCodeByNcGroupList(@Param("site")String site, @Param("locale")String locale, @Param("ncGroup")String[] ncGroup); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcCodeService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcCodeService.java index a0beafd4..356127f7 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcCodeService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcCodeService.java @@ -38,4 +38,6 @@ public interface NcCodeService extends IService { List findNcCodeByNcGroup(NcGroup ncGroup); List findNcCodeDescriptionByNcCode(String ncCode); + + List findNcCodeByNcGroupList(String ncGroup); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcCodeServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcCodeServiceImpl.java index b9d18b3c..b088a713 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcCodeServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcCodeServiceImpl.java @@ -91,5 +91,14 @@ public class NcCodeServiceImpl extends ServiceImpl impleme return ncCodeMapper.findNcCodeDescriptionByNcCode(site,locale,split); } + @Override + public List findNcCodeByNcGroupList(String ncCode) { + String site = CommonMethods.getSite(); + String locale = LocaleContextHolder.getLocale().getLanguage(); + String[] split = ncCode.split(","); + + return ncCodeMapper.findNcCodeByNcGroupList(site,locale,split); + } + } \ No newline at end of file diff --git a/meapi/src/main/resources/mapper/NcCodeMapper.xml b/meapi/src/main/resources/mapper/NcCodeMapper.xml index f5408f42..82803b6f 100644 --- a/meapi/src/main/resources/mapper/NcCodeMapper.xml +++ b/meapi/src/main/resources/mapper/NcCodeMapper.xml @@ -434,4 +434,19 @@ + + + From ad333873452aac95cb64443e015bf34c3f6f47ac Mon Sep 17 00:00:00 2001 From: zpl Date: Thu, 12 Aug 2021 21:47:27 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=88=80=E5=85=B7=E6=8C=89=E9=92=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/production/service/impl/CutterLogServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/CutterLogServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/CutterLogServiceImpl.java index dd317a3e..e6fe607c 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/CutterLogServiceImpl.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/CutterLogServiceImpl.java @@ -88,6 +88,9 @@ public class CutterLogServiceImpl extends ServiceImpl Date: Fri, 13 Aug 2021 09:41:25 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=82=B9=E6=A3=80?= =?UTF-8?q?=E3=80=81=E7=BB=B4=E4=BF=AE=E7=94=A8=E6=88=B7=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E3=80=81=E4=B8=8D=E8=89=AF=E6=8F=8F=E8=BF=B0=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/common/constant/Constants.java | 8 ++++++++ .../mesnac/equip/dto/ResourceInspectTaskDto.java | 10 ++++++++++ .../mesnac/equip/model/ResourceRepairTask.java | 12 ++++++++++++ .../impl/ResourceRepairTaskServiceImpl.java | 15 +++++++-------- .../mapper/ResourceInspectTaskMapper.xml | 3 ++- .../resources/mapper/ResourceRepairTaskMapper.xml | 3 ++- 6 files changed, 41 insertions(+), 10 deletions(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java b/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java index d74e4366..40ba9000 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java @@ -128,6 +128,14 @@ public interface Constants { /** * 设备维修 */ + // 维修任务状态 + String REPAIR_STATUS_NEW = "401"; // 新建/待维修 + String REPAIR_STATUS_DOING = "501"; // 维修中 + String REPAIR_STATUS_WAIT = "502"; // 维修等待 + String REPAIR_STATUS_CLOSE = "302"; // 关闭 + String REPAIR_STATUS_COMPLETE = "301"; // 维修完成 + String REPAIR_STATUS_CONFIRM = "601"; // 报修单确认 + // 纠正预防-根本原因 String PRIMARY_BURN_IN = "BI"; //部件老化 String REASON_BREAK_DOWN = "BD"; //正常损坏 diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java b/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java index 387878fe..17124e2a 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java @@ -90,6 +90,16 @@ public class ResourceInspectTaskDto implements Serializable { private List taskItemDetailList; /**消耗备品**/ private List spareList; + /**用户名称**/ + private String fullName; + + public String getFullName() { + return fullName; + } + + public void setFullName(String fullName) { + this.fullName = fullName; + } public Integer getItemSeq() { return itemSeq; diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java index ea5734e0..4870d081 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java @@ -297,7 +297,19 @@ public class ResourceRepairTask extends Model { */ @TableField(exist = false) private Integer seq; + /** + * 提报人名称 + */ + @TableField(exist = false) + private String reportUserName; + public String getReportUserName() { + return reportUserName; + } + + public void setReportUserName(String reportUserName) { + this.reportUserName = reportUserName; + } public List getSpareList() { return spareList; diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java index 7cb7608f..e33fb29d 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java @@ -5,6 +5,7 @@ import com.foreverwin.mesnac.common.enums.HandleEnum; import com.foreverwin.mesnac.common.helper.NextNumberHelper; import com.foreverwin.mesnac.equip.model.ResourceInspectTaskSpare; import com.foreverwin.mesnac.equip.service.ResourceInspectTaskSpareService; +import com.foreverwin.mesnac.meapi.dto.NcCodeDto; import com.foreverwin.mesnac.meapi.model.NcCode; import com.foreverwin.mesnac.meapi.model.NwaUser; import com.foreverwin.mesnac.meapi.service.NcCodeService; @@ -94,16 +95,14 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl ncCodeDescriptionByNcCode = ncCodeService.findNcCodeDescriptionByNcCode(ncCodeNo); + StringBuffer ncCodeDescription = new StringBuffer(""); + for (NcCodeDto ncCode:ncCodeDescriptionByNcCode) { + ncCodeDescription.append(ncCode.getDescription()).append(";"); + } + resourceRepairTask.setOther(ncCodeDescription.toString()); } - /* Collection collection = new ArrayList<>(); - for (int i = 0; i < ncSplit.length; i++) { - collection.add(HandleEnum.NC_CODE.getHandle(site,ncSplit[i])); - } - Collection ncCodes = ncCodeService.listByIds(collection); - if ( ncCodes.size() != ncSplit.length ){ - throw BusinessException.build("不良代码错误！！！"); - }*/ // 维修单号、维修HANDLE List nextNumber = nextNumberHelper.getNextNumber(site, Constants.RESOURCE_REPAIR_TASK, 1); resourceRepairTask.setRepairNo(nextNumber.get(0)); diff --git a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml index 8543588c..c630b32d 100644 --- a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml +++ b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml @@ -643,11 +643,12 @@ - SELECT DISTINCT RRT.*,R.DESCRIPTION AS RESOURCE_DESCRIPTION,R.RESRCE AS RESOURCE_NO, + SELECT DISTINCT RRT.*, ZNU.FULL_NAME AS REPORT_USER_NAME, R.DESCRIPTION AS RESOURCE_DESCRIPTION,R.RESRCE AS RESOURCE_NO, WCMA.WORK_CENTER_BO AS WORK_CENTER_BO, WCT.DESCRIPTION AS WORK_CENTER_DESCRIPTION FROM WIP.Z_RESOURCE_REPAIR_TASK RRT + LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = RRT.REPORT_USER INNER JOIN WIP.RESRCE R ON RRT.SITE = R.SITE AND R.RESRCE = RRT.RESOURCE_NO LEFT JOIN WIP.WORK_CENTER_MEMBER WCM ON WCM.WORK_CENTER_OR_RESOURCE_GBO = R.HANDLE LEFT JOIN WIP.WORK_CENTER_MEMBER WCMA ON WCMA.WORK_CENTER_OR_RESOURCE_GBO = WCM.WORK_CENTER_BO From dffd98413de1a3adaa6599303232cba1a0938d2a Mon Sep 17 00:00:00 2001 From: zpl Date: Fri, 13 Aug 2021 10:30:08 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreverwin/mesnac/common/dto/LabelPrintDto.java | 10 ++++++++++ .../service/impl/SurplusReturnServiceImpl.java | 2 ++ .../integration/service/impl/InterfaceServiceImpl.java | 4 +++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java b/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java index e9a55742..81798a82 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java @@ -25,6 +25,8 @@ public class LabelPrintDto implements Serializable { private String supplier; //批次号 private String batch; + // 物料条码 + private String label; //在制品标签参数 //工作指令 @@ -104,6 +106,14 @@ public class LabelPrintDto implements Serializable { this.batch = batch; } + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + public String getWorkOrder() { return workOrder; } diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusReturnServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusReturnServiceImpl.java index f476f625..349015b1 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusReturnServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusReturnServiceImpl.java @@ -216,9 +216,11 @@ public class SurplusReturnServiceImpl extends ServiceImpl