diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml index e84dfa1e..24f60e19 100644 --- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml +++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml @@ -69,6 +69,7 @@ + @@ -992,7 +993,8 @@ CASE WHEN B.BOM != 'NULL' THEN B.BOM || '/' || B.REVISION END BOM, CASE WHEN ZSS.HANDLE != 'NULL' THEN ZSS.REASON ELSE ZABV.PB_DESCRIPTION - END REASON + END REASON, + ZSS.TYPE TYPE FROM SFC S INNER JOIN SFC_ROUTING SR ON SR.SFC_BO = S.HANDLE INNER JOIN SFC_ROUTER ST ON ST.SFC_ROUTING_BO = SR.HANDLE @@ -1004,7 +1006,11 @@ LEFT JOIN ROUTER R ON R.HANDLE = ZSD.ROUTER_BO LEFT JOIN Z_SFC_SCRAP ZSS ON ZSS.SFC = S.SFC AND ZSS.SITE = S.SITE LEFT JOIN BOM B ON B.HANDLE = SO.PLANNED_BOM_BO - INNER JOIN ( SELECT * FROM Z_ABNORMAL_BILL_VIEW ZABV WHERE ZABV.HANDLE = (SELECT MAX(HANDLE) FROM Z_ABNORMAL_BILL_VIEW) ) ZABV ON ZABV.SFC = S.SFC AND ZABV.SITE= S.SITE + INNER JOIN ( SELECT * FROM Z_ABNORMAL_BILL_VIEW ZABV WHERE ZABV.HANDLE = (SELECT MAX(HANDLE) FROM Z_ABNORMAL_BILL_VIEW ZABV2 + + ZABV2.SFC = #{sfc} + + )) ZABV ON ZABV.SFC = S.SFC AND ZABV.SITE= S.SITE S.SITE = #{site} AND S.SFC = #{sfc} @@ -1014,6 +1020,6 @@ SELECT * FROM Z_ABNORMAL_BILL zab JOIN sfc s ON zab.SITE=s.SITE AND zab.SFC=s.SFC JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZABD.ABNORMAL_BILL_BO= ZAB.HANDLE - WHERE zab.SITE=#{site} AND zab.STATUS='G' AND zab."TYPE"='Z' AND s.QTY>1 AND (ZABD.ABNORMAL_METHOD='F' OR ZABD.ABNORMAL_METHOD='C') AND ZABD.ROUTER_BO IS NOT NULL ORDER BY ZABD.CLOSED_DATE_TIME DESC + WHERE zab.SITE=#{site} AND zab.STATUS='G' AND zab."TYPE"='Z' AND s.QTY>1 AND (ZABD.ABNORMAL_METHOD='F' OR ZABD.ABNORMAL_METHOD='C') ORDER BY ZABD.CLOSED_DATE_TIME DESC diff --git a/common/src/main/java/com/foreverwin/mesnac/common/controller/PrinterController.java b/common/src/main/java/com/foreverwin/mesnac/common/controller/PrinterController.java new file mode 100644 index 00000000..17e6ee63 --- /dev/null +++ b/common/src/main/java/com/foreverwin/mesnac/common/controller/PrinterController.java @@ -0,0 +1,93 @@ +package com.foreverwin.mesnac.common.controller; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.foreverwin.mesnac.common.enums.HandleEnum; +import com.foreverwin.mesnac.common.model.Printer; +import com.foreverwin.modular.core.util.CommonMethods; +import com.foreverwin.modular.core.util.R; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.foreverwin.mesnac.common.service.PrinterService; +import java.time.LocalDateTime; +import java.util.List; + +/** + * + * @author Leon.L + * @since 2021-08-11 + */ +@RestController +@RequestMapping("/PRINTER") +public class PrinterController { + + @Autowired + public PrinterService printerService; + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getPrinterList(Printer printer){ + List result; + try { + String site = CommonMethods.getSite(); + printer.setSite(site); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(printer); + result = printerService.list(queryWrapper); + } catch (Exception e) { + return R.failed(e.getMessage()); + } + + return R.ok(result); + } + + @ResponseBody + @GetMapping("/getPrinter") + public R savePrinter(String printer) { + Printer result = null; + try { + String site = CommonMethods.getSite(); + String handle = HandleEnum.PRINT.getHandle(site, printer); + result = printerService.getById(handle); + } catch (Exception e) { + return R.failed(e.getMessage()); + } + + return R.ok(result); + } + + @ResponseBody + @PostMapping("/savePrinter") + public R savePrinter(Printer printer) { + try { + LocalDateTime nowDate = LocalDateTime.now(); + String site = CommonMethods.getSite(); + + String handle = HandleEnum.PRINT.getHandle(site, printer.getPrinter()); + Printer printerModel = printerService.getById(handle); + if (printerModel == null) { + printer.setHandle(handle); + printer.setSite(site); + printer.setCreatedDateTime(nowDate); + printer.setModifiedDateTime(nowDate); + printerService.save(printer); + } else { + printerModel.setDescription(printer.getDescription()); + printerModel.setModifiedDateTime(nowDate); + printerService.updateById(printerModel); + } + } catch (Exception e) { + return R.failed(e.getMessage()); + } + + return R.ok(); + } +} \ No newline at end of file diff --git a/common/src/main/java/com/foreverwin/mesnac/common/dto/ScrapDto.java b/common/src/main/java/com/foreverwin/mesnac/common/dto/ScrapDto.java index 4b15b007..0d3c933b 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/dto/ScrapDto.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/dto/ScrapDto.java @@ -24,6 +24,8 @@ public class ScrapDto { private String reason; + private String type; + public String getSfc() { return sfc; } @@ -95,4 +97,12 @@ public class ScrapDto { public void setReason(String reason) { this.reason = reason; } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } } 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 7a72e34a..3e3b1ca7 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 @@ -20,6 +20,8 @@ public enum HandleEnum { /**物料清单**/ BOM("BOMBO:","BOMBO:{0},{1},{2},{3}"), + PRINT("PrintBO:", "StatusBO:{0},{1}"), + /**叫料**/ CALL_ITEM("CallItemBO:", "CallItemBO:{0},{1}"), diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/PrinterMapper.java b/common/src/main/java/com/foreverwin/mesnac/common/mapper/PrinterMapper.java similarity index 67% rename from meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/PrinterMapper.java rename to common/src/main/java/com/foreverwin/mesnac/common/mapper/PrinterMapper.java index da30ef1c..c5884313 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/PrinterMapper.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/mapper/PrinterMapper.java @@ -1,6 +1,6 @@ -package com.foreverwin.mesnac.meapi.mapper; +package com.foreverwin.mesnac.common.mapper; -import com.foreverwin.mesnac.meapi.model.Printer; +import com.foreverwin.mesnac.common.model.Printer; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.springframework.stereotype.Repository; @@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository; *

* * @author Leon.L - * @since 2021-07-22 + * @since 2021-08-11 */ @Repository public interface PrinterMapper extends BaseMapper { diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Printer.java b/common/src/main/java/com/foreverwin/mesnac/common/model/Printer.java similarity index 91% rename from meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Printer.java rename to common/src/main/java/com/foreverwin/mesnac/common/model/Printer.java index dde11f5f..3c07a59f 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Printer.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/model/Printer.java @@ -1,7 +1,8 @@ -package com.foreverwin.mesnac.meapi.model; +package com.foreverwin.mesnac.common.model; import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import java.time.LocalDateTime; @@ -15,15 +16,15 @@ import com.baomidou.mybatisplus.annotation.IdType; *

* * @author Leon.L - * @since 2021-07-22 + * @since 2021-08-11 */ -@TableName("PRINTER") +@TableName("Z_PRINTER") public class Printer extends Model { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - @TableField("HANDLE") + @TableId(value = "HANDLE", type = IdType.INPUT) private String handle; @TableField("SITE") private String site; diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/PrinterService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/PrinterService.java similarity index 81% rename from meapi/src/main/java/com/foreverwin/mesnac/meapi/service/PrinterService.java rename to common/src/main/java/com/foreverwin/mesnac/common/service/PrinterService.java index 0e63e6a4..50d35fbc 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/PrinterService.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/PrinterService.java @@ -1,7 +1,7 @@ -package com.foreverwin.mesnac.meapi.service; +package com.foreverwin.mesnac.common.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.foreverwin.mesnac.meapi.model.Printer; +import com.foreverwin.mesnac.common.model.Printer; import com.baomidou.mybatisplus.extension.service.IService; import com.foreverwin.modular.core.util.FrontPage; @@ -13,7 +13,7 @@ import java.util.List; *

* * @author Leon.L - * @since 2021-07-22 + * @since 2021-08-11 */ public interface PrinterService extends IService { diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/UserService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/UserService.java index eeb9af99..f03c422d 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/UserService.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/UserService.java @@ -11,6 +11,7 @@ import java.util.List; * @Since 2021-08-10 */ public interface UserService { + List findList(String user); IPage findPage(IPage page,String user); diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/PrinterServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrinterServiceImpl.java similarity index 83% rename from meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/PrinterServiceImpl.java rename to common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrinterServiceImpl.java index 3d461f85..c8ac3174 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/PrinterServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrinterServiceImpl.java @@ -1,11 +1,11 @@ -package com.foreverwin.mesnac.meapi.service.impl; +package com.foreverwin.mesnac.common.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.Printer; -import com.foreverwin.mesnac.meapi.mapper.PrinterMapper; -import com.foreverwin.mesnac.meapi.service.PrinterService; +import com.foreverwin.mesnac.common.model.Printer; +import com.foreverwin.mesnac.common.mapper.PrinterMapper; +import com.foreverwin.mesnac.common.service.PrinterService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; @@ -18,7 +18,7 @@ import java.util.List; *

* * @author Leon.L - * @since 2021-07-22 + * @since 2021-08-11 */ @Service @Transactional(rollbackFor = Exception.class) 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 048a8df8..5bba7756 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 @@ -523,12 +523,12 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl - + - + @@ -22,7 +22,7 @@ - SELECT FROM PRINTER + SELECT FROM Z_PRINTER HANDLE=#{ew.handle} @@ -51,7 +51,7 @@ - - INSERT INTO PRINTER + + INSERT INTO Z_PRINTER HANDLE, SITE, @@ -222,8 +222,8 @@ - - INSERT INTO PRINTER + + INSERT INTO Z_PRINTER VALUES @@ -244,7 +244,7 @@ - UPDATE PRINTER + UPDATE Z_PRINTER HANDLE=#{et.handle}, SITE=#{et.site}, PRINTER=#{et.printer}, @@ -276,7 +276,7 @@ - DELETE FROM PRINTER + DELETE FROM Z_PRINTER @@ -289,7 +289,7 @@ - DELETE FROM PRINTER + DELETE FROM Z_PRINTER diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java index 6e945aa4..5311e584 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java @@ -100,6 +100,7 @@ public class CallItemServiceImpl extends ServiceImpl i callItem.setHandle(HandleEnum.CALL_ITEM.getHandle(site, callItemNo)); callItem.setCallType(Constants.CALL_TYPE_MATERIAL); callItem.setStatus(Constants.CALL_ITEM_STATUS_NEW); + callItem.setIssueQty(BigDecimal.ZERO); callItem.setCreateUser(user); callItem.setCreatedDateTime(nowDate); callItem.setModifyUser(user); @@ -329,7 +330,7 @@ public class CallItemServiceImpl extends ServiceImpl i } if ("GB".equals(itemGroup) && blankingSize.contains("*")) { - String []size = blankingSize.split("/*"); + String []size = blankingSize.split("\\*"); if (size != null && size.length >= 2) { int sizeLength = size.length; BigDecimal length = new BigDecimal(size[sizeLength-1]); @@ -341,7 +342,7 @@ public class CallItemServiceImpl extends ServiceImpl i compQtyMap.put(component, (compQtyMap.get(component) != null ? compQtyMap.get(component).add(sizeReqQty) : sizeReqQty)); } } else { - String []size = blankingSize.split("/*"); + String []size = blankingSize.split("\\*"); if (size != null && size.length >= 1) { int sizeLength = size.length; BigDecimal length = new BigDecimal(size[sizeLength-1]); 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 ce92e030..f476f625 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 @@ -85,10 +85,10 @@ public class SurplusReturnServiceImpl extends ServiceImpl findEmployeeList(String site) { return userResourceMapper.findEmployeeList(site); @@ -62,7 +65,9 @@ public class UserResourceServiceImpl extends ServiceImpl hashMap = new HashMap<>();; - List nwaUserList = nwaUserService.selectList(null); + // List nwaUserList = nwaUserService.selectList(null); + List nwaUserList = userService.findList(null); + List userResourceList = userResourceMapper.findAll(site, resource, userId); hashMap.put("users",nwaUserList); hashMap.put("userResources",userResourceList); @@ -88,14 +93,15 @@ public class UserResourceServiceImpl extends ServiceImpl userByUserName = userService.findList(userResource.getUserId()); if("false".equals(userResource.getTemporaryUser()) && - userByUserName == null){ + userByUserName.size() <= 0){ throw BusinessException.build("第"+(i+1)+"行的用户不存在，必须为临时用户"); - }else if(userByUserName != null){ + }else if(userByUserName != null && userByUserName.size() > 0){ //userByUserName.setFullName(userResource.getUserDescription()); - userResource.setUserDescription(userByUserName.getFullName()); - nwaUserService.saveOrUpdate(userByUserName); + userResource.setUserDescription(userByUserName.get(0).getFullName()); + //nwaUserService.saveOrUpdate(userByUserName); } userResource.setStatus(userResourceDto.getStatus()); userResource.setHandle("UserResourceBo:"+userResource.getSite()+","+ diff --git a/integration/pom.xml b/integration/pom.xml index c8f3bbba..deeb8a22 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -34,12 +34,10 @@ com.foreverwin.mesnac meapi - com.foreverwin.mesnac common - com.foreverwin.mesnac dispatch diff --git a/listener/src/main/java/com/foreverwin/mesnac/listener/service/UsrService.java b/listener/src/main/java/com/foreverwin/mesnac/listener/service/UsrService.java index 19800010..bff21257 100644 --- a/listener/src/main/java/com/foreverwin/mesnac/listener/service/UsrService.java +++ b/listener/src/main/java/com/foreverwin/mesnac/listener/service/UsrService.java @@ -2,7 +2,6 @@ package com.foreverwin.mesnac.listener.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.foreverwin.mesnac.common.service.UserService; import com.foreverwin.mesnac.listener.model.SysUser; import com.foreverwin.mesnac.listener.model.Usr; import com.foreverwin.modular.core.util.FrontPage; @@ -17,7 +16,7 @@ import java.util.List; * @author sungang * @since 2020-10-16 */ -public interface UsrService extends IService, UserService { +public interface UsrService extends IService { /** * 分页查询 diff --git a/listener/src/main/java/com/foreverwin/mesnac/listener/service/impl/UsrServiceImpl.java b/listener/src/main/java/com/foreverwin/mesnac/listener/service/impl/UsrServiceImpl.java index b6484643..6b752c5b 100644 --- a/listener/src/main/java/com/foreverwin/mesnac/listener/service/impl/UsrServiceImpl.java +++ b/listener/src/main/java/com/foreverwin/mesnac/listener/service/impl/UsrServiceImpl.java @@ -4,6 +4,7 @@ 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.dto.UsrDto; +import com.foreverwin.mesnac.common.service.UserService; import com.foreverwin.mesnac.listener.mapper.UsrMapper; import com.foreverwin.mesnac.listener.model.SysUser; import com.foreverwin.mesnac.listener.model.Usr; @@ -26,7 +27,7 @@ import java.util.List; */ @Service @Transactional(rollbackFor = Exception.class) -public class UsrServiceImpl extends ServiceImpl implements UsrService { +public class UsrServiceImpl extends ServiceImpl implements UsrService,UserService { @Autowired diff --git a/listener/src/main/resources/mapper/UsrMapper.xml b/listener/src/main/resources/mapper/UsrMapper.xml index b40e7fb2..f61d2226 100644 --- a/listener/src/main/resources/mapper/UsrMapper.xml +++ b/listener/src/main/resources/mapper/UsrMapper.xml @@ -616,7 +616,12 @@ SELECT U.USER_ID USER_NAME,ZNU.FULL_NAME FULL_NAME FROM USR U INNER JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = U.USER_ID - WHERE U.SITE=#{site} AND U.USER_ID = #{user} + WHERE U.SITE=#{site} + + AND ( + U.USER_ID = #{user} + ) + diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/PrinterController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/PrinterController.java deleted file mode 100644 index d189884d..00000000 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/PrinterController.java +++ /dev/null @@ -1,130 +0,0 @@ -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.PrinterService; -import com.foreverwin.mesnac.meapi.model.Printer; -import java.util.List; - -/** - * - * @author Leon.L - * @since 2021-07-22 - */ -@RestController -@RequestMapping("/PRINTER") -public class PrinterController { - - @Autowired - public PrinterService printerService; - - /** - * 根据id查询 - * - * @param id 主键 - * @return - */ - @ResponseBody - @GetMapping("/{id:.+}") - public R getPrinterById(@PathVariable String id) { - return R.ok( printerService.getById(id)); - } - - /** - * 查询所有数据 - * - * @return - */ - @ResponseBody - @GetMapping("") - public R getPrinterList(Printer printer){ - List result; - try { - String site = CommonMethods.getSite(); - printer.setSite(site); - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.setEntity(printer); - result = printerService.list(queryWrapper); - } catch (Exception e) { - return R.failed(e.getMessage()); - } - - return R.ok(result); - } - - /** - * 分页查询数据 - * - * @param frontPage 分页信息 - * @return - */ - @ResponseBody - @GetMapping("/page") - public R page(FrontPage frontPage, Printer printer){ - IPage result; - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.setEntity(printer); - if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { - //TODO modify global query - queryWrapper.lambda().and(wrapper -> wrapper - .like(Printer::getHandle, frontPage.getGlobalQuery()) - .or().like(Printer::getSite, frontPage.getGlobalQuery()) - .or().like(Printer::getPrinter, frontPage.getGlobalQuery()) - .or().like(Printer::getDescription, frontPage.getGlobalQuery()) - .or().like(Printer::getEnabled, frontPage.getGlobalQuery()) - ); - } - result = printerService.page(frontPage.getPagePlus(), queryWrapper); - return R.ok(result); - } - - /** - * 新增 - * @param printer 传递的实体 - * @return null 失败 实体成功 - */ - @PostMapping - public R save(@RequestBody Printer printer) { - return R.ok(printerService.save(printer)); - } - - /** - * 修改 - * @param printer 传递的实体 - * @return null 失败 实体成功 - */ - @PutMapping - public R updateById(@RequestBody Printer printer) { - return R.ok(printerService.updateById(printer)); - } - - /** - * 根据id删除对象 - * @param id 实体ID - * @return 0 失败 1 成功 - */ - @ResponseBody - @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") - public R removeById(@PathVariable("id") String id){ - return R.ok(printerService.removeById(id)); - } - - /** - * 批量删除对象 - * @param ids 实体集合ID - * @return 0 失败 1 成功 - */ - @ResponseBody - @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") - public R removeByIds(List ids){ - return R.ok(printerService.removeByIds(ids)); - } -} \ No newline at end of file diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SfcScrapServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SfcScrapServiceImpl.java index 14a6e95c..619c4874 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SfcScrapServiceImpl.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SfcScrapServiceImpl.java @@ -5,7 +5,9 @@ import com.alibaba.fastjson.JSONArray; 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.dto.UsrDto; import com.foreverwin.mesnac.common.enums.HandleEnum; +import com.foreverwin.mesnac.common.service.UserService; import com.foreverwin.mesnac.common.util.StringUtil; import com.foreverwin.mesnac.meapi.mapper.SfcMapper; import com.foreverwin.mesnac.meapi.model.Sfc; @@ -72,6 +74,9 @@ public class SfcScrapServiceImpl extends ServiceImpl i @Autowired private PodTemplateService podTemplateService; + @Autowired + private UserService userService; + @Override public IPage selectPage(FrontPage frontPage, SfcScrap sfcScrap) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -211,12 +216,14 @@ public class SfcScrapServiceImpl extends ServiceImpl i int day = now.getDayOfMonth(); Map wordMap = sfcScrapMapper.generatorWord(site,locale ,shopOrder, sfc); wordMap.put("SCRAP_MARK","线下质量贴红色标签"); - wordMap.put("OPERATOR",user); - if(!StringUtil.isBlank(wordMap.get("TYPE"))){ - wordMap.put("GF",(wordMap.get("TYPE").contains("GF"))? "✔": ""); - wordMap.put("LF",(wordMap.get("TYPE").contains("LF"))? "✔": ""); - wordMap.put("OT",(wordMap.get("TYPE").contains("QT"))? "✔": ""); + + List list = userService.findList(user); + if(list.size() > 0){ + wordMap.put("OPERATOR",list.get(0).getFullName()); } + wordMap.put("GF",(wordMap.get("TYPE").contains("GF"))? "✔": " "); + wordMap.put("LF",(wordMap.get("TYPE").contains("LF"))? "✔": " "); + wordMap.put("OT",(wordMap.get("TYPE").contains("QT"))? "✔": " "); wordMap.put("OPINION","报废"); wordMap.put("YEAR",year + ""); wordMap.put("MONTH",month + ""); diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java index 4850dd6b..4bf58e23 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java @@ -177,15 +177,12 @@ public class SplitSfcServiceImpl extends ServiceImpl i SplitSfcDto splitSfcDto=splitSfcMapper.getAbnormalQty(site,sfc,operation, abnormalNo); String routerBo = splitSfcDto.getRouterBo(); String ncCode = splitSfcDto.getNcCode(); - if (StringUtil.isBlank(routerBo)){ - throw new BaseException("异常处置未选择处置工艺路线"); - } if (StringUtil.isBlank(ncCode)){ throw new BaseException("异常处置未选择不良代码"); } BigDecimal sfcQty = new BigDecimal(sfcData.getQty()); if (new BigDecimal(splitSfcDto.getNcQty()).compareTo(sfcQty)>=0){ - throw new BaseException("质量异常数量不小于于产品条码的数量，不能拆分"); + throw new BaseException("质量异常数量大于等于于产品条码的数量，不能拆分"); } if (splitQty.compareTo(new BigDecimal(splitSfcDto.getNcQty()))>0){ throw new BaseException("拆分数量大于质量异常数量的数量，不能拆分"); @@ -206,37 +203,42 @@ public class SplitSfcServiceImpl extends ServiceImpl i Collection splitSfcResponses = splitService.splitSfc(splitSfcRequest); SplitSfcResponse splitSfcResponse = splitSfcResponses.iterator().next(); String newSfcRef = splitSfcResponse.getNewSfcRef(); - //记录不合格 - CreateNCRequest createNCRequest=new CreateNCRequest(); - createNCRequest.setQty(splitQty); - createNCRequest.setSfcRef(newSfcRef); - ProductionContext productionContext=new ProductionContext(); - StepIdentifier stepIdentifier=new StepIdentifier(); - stepIdentifier.setStepId(sfcData.getStepId()); - stepIdentifier.setOperationId(sfcData.getOperation()); - productionContext.setStepIdentifier(stepIdentifier); - List resourceBySfc = sfcCrossMapper.getResourceBySfc(site, sfc); - if (resourceBySfc.isEmpty()){ - throw new BaseException("产品不在工作中"); + String newSfc = StringUtil.trimHandle(newSfcRef); + + if(StringUtil.notBlank(routerBo)){ + //记录不合格 + CreateNCRequest createNCRequest=new CreateNCRequest(); + createNCRequest.setQty(splitQty); + createNCRequest.setSfcRef(newSfcRef); + ProductionContext productionContext=new ProductionContext(); + StepIdentifier stepIdentifier=new StepIdentifier(); + stepIdentifier.setStepId(sfcData.getStepId()); + stepIdentifier.setOperationId(sfcData.getOperation()); + productionContext.setStepIdentifier(stepIdentifier); + List resourceBySfc = sfcCrossMapper.getResourceBySfc(site, sfc); + if (resourceBySfc.isEmpty()){ + throw new BaseException("产品不在工作中"); + } + productionContext.setResourceRef(resourceBySfc.get(0).getResourceBo()); + createNCRequest.setProdCtx(productionContext); + createNCRequest.setNcCodeRef(HandleEnum.NC_CODE.getHandle(site,splitNcCode[0])); + ncProductionService.createNC(createNCRequest); + //不合格处置特殊工艺路线 + DispositionMultipleSfcsRequest dispositionSfcsRequest=new DispositionMultipleSfcsRequest(); + List sfcs=new ArrayList<>(); + sfcs.add(newSfcRef); + dispositionSfcsRequest.setSfcs(sfcs); + dispositionSfcsRequest.setBypassStepValidation(true); + DispositionSelection dispositionSelection=new DispositionSelection(); + Router maxRevisionRouter = routerService.getMaxRevisionRouter(site, StringUtil.trimHandle(routerBo)); + dispositionSelection.setRouterRef(maxRevisionRouter.getHandle()); + dispositionSfcsRequest.setDispositionSelection(dispositionSelection); + dispositionSfcsRequest.setProdCtx(new ProductionContext()); + ncProductionService.dispositionMultipleSfcs(dispositionSfcsRequest); + String workCenterBo = shopOrderService.getById(HandleEnum.SHOP_ORDER.getHandle(site, sfcData.getShopOrder())).getPlannedWorkCenterBo(); + sfcDispatchCommonService.saveSfcDispatch(site,CommonMethods.getUser(),StringUtil.trimHandle(workCenterBo),newSfc, sfcData.getShopOrder(),maxRevisionRouter.getHandle()); } - productionContext.setResourceRef(resourceBySfc.get(0).getResourceBo()); - createNCRequest.setProdCtx(productionContext); - createNCRequest.setNcCodeRef(HandleEnum.NC_CODE.getHandle(site,splitNcCode[0])); - ncProductionService.createNC(createNCRequest); - //不合格处置特殊工艺路线 - DispositionMultipleSfcsRequest dispositionSfcsRequest=new DispositionMultipleSfcsRequest(); - List sfcs=new ArrayList<>(); - sfcs.add(newSfcRef); - dispositionSfcsRequest.setSfcs(sfcs); - dispositionSfcsRequest.setBypassStepValidation(true); - DispositionSelection dispositionSelection=new DispositionSelection(); - Router maxRevisionRouter = routerService.getMaxRevisionRouter(site, StringUtil.trimHandle(routerBo)); - dispositionSelection.setRouterRef(maxRevisionRouter.getHandle()); - dispositionSfcsRequest.setDispositionSelection(dispositionSelection); - dispositionSfcsRequest.setProdCtx(new ProductionContext()); - ncProductionService.dispositionMultipleSfcs(dispositionSfcsRequest); SplitSfc splitSfc=new SplitSfc(); - String newSfc = StringUtil.trimHandle(newSfcRef); splitSfc.setHandle(HandleEnum.SPLIT_SFC.getHandle(site,newSfc)); splitSfc.setSite(site); splitSfc.setSfc(sfc); @@ -246,8 +248,6 @@ public class SplitSfcServiceImpl extends ServiceImpl i splitSfc.setCreateUser(CommonMethods.getUser()); splitSfc.setCreatedDateTime(LocalDateTime.now()); save(splitSfc); - String workCenterBo = shopOrderService.getById(HandleEnum.SHOP_ORDER.getHandle(site, sfcData.getShopOrder())).getPlannedWorkCenterBo(); - sfcDispatchCommonService.saveSfcDispatch(site,CommonMethods.getUser(),StringUtil.trimHandle(workCenterBo),newSfc, sfcData.getShopOrder(),maxRevisionRouter.getHandle()); return splitSfc; } catch (Exception e) { ExceptionUtil.throwException(e); diff --git a/quality/src/main/resources/mapper/SelfReportMapper.xml b/quality/src/main/resources/mapper/SelfReportMapper.xml index 91c0433b..1cb34a29 100644 --- a/quality/src/main/resources/mapper/SelfReportMapper.xml +++ b/quality/src/main/resources/mapper/SelfReportMapper.xml @@ -153,9 +153,10 @@