From 7f20a2229b46f3badb19984aa0972ce3fbdd39ff Mon Sep 17 00:00:00 2001 From: Leon <3066758958@qq.com> Date: Sun, 8 Aug 2021 20:18:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=B4=BE=E5=B7=A5+?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/common/dto/SfcDispatchDto.java | 11 +- .../src/main/resources/application-local.yml | 30 +++- .../controller/CallItemController.java | 19 ++- .../controller/SfcDispatchController.java | 86 +++++----- .../mesnac/dispatch/dto/IssueItemDto.java | 9 + .../dispatch/mapper/CallItemMapper.java | 2 +- .../dispatch/mapper/SfcDispatchMapper.java | 4 +- .../mesnac/dispatch/model/CallItem.java | 30 ++++ .../dispatch/model/ShopOrderRelease.java | 9 - .../dispatch/service/CallItemService.java | 19 ++- .../dispatch/service/ItemBatchService.java | 3 + .../dispatch/service/SfcDispatchService.java | 8 +- .../service/impl/CallItemServiceImpl.java | 155 ++++++++++++++++-- .../service/impl/IssueItemServiceImpl.java | 20 ++- .../service/impl/ItemBatchServiceImpl.java | 14 +- .../service/impl/SfcDispatchServiceImpl.java | 20 ++- .../main/resources/mapper/CallItemMapper.xml | 37 +++-- .../resources/mapper/SfcDispatchMapper.xml | 3 +- .../service/impl/InterfaceServiceImpl.java | 27 ++- .../meapi/controller/ResrceController.java | 2 +- .../main/resources/mapper/ResrceMapper.xml | 3 +- 21 files changed, 390 insertions(+), 121 deletions(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java b/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java index 198779cf..42d221a8 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java @@ -131,7 +131,7 @@ public class SfcDispatchDto implements Serializable{ /** * 派工备注 */ - @ExcelColumn("备注") + @ExcelColumn("备注信息") private String remark; /** * 前置工序 @@ -174,7 +174,6 @@ public class SfcDispatchDto implements Serializable{ private String componentDescription; private String isCompleted; private BigDecimal completedQty; - private String userName; private String resourceWorkCenter; private String status; @@ -578,14 +577,6 @@ public class SfcDispatchDto implements Serializable{ this.completedQty = completedQty; } - public String getUserName() { - return userName; - } - - public void setUserName(String userName) { - this.userName = userName; - } - public String getResourceWorkCenter() { return resourceWorkCenter; } diff --git a/console/src/main/resources/application-local.yml b/console/src/main/resources/application-local.yml index 02dbcc6f..8c046671 100644 --- a/console/src/main/resources/application-local.yml +++ b/console/src/main/resources/application-local.yml @@ -1,6 +1,7 @@ #Spring spring: datasource: + hikari: dynamic: primary: wip #设置默认的数据源或者数据源组,默认值即为master datasource: @@ -9,8 +10,35 @@ spring: username: wip password: wip driver-class-name: oracle.jdbc.OracleDriver + druid: + filters: stat,wall,log4j2 + initial-size: 5 + max-active: 50 + min-idle: 5 + max-wait: 60000 + validation-query: SELECT 'x' FROM DUAL + test-on-borrow: true + test-on-return: true + test-while-idle: true + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + remove-abandoned: true + remove-abandoned-timeout: 1800 + log-abandoned: true + web-stat-filter: + enabled: true + url-pattern: /* + exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*' + stat-view-servlet: + enabled: true + url-pattern: /druid/* + reset-enable: false + stat: + log-slow-sql: true + merge-sql: true + slow-sql-millis: 100 activemq: - enabled: true + enabled: false brokerUrl: tcp://121.36.58.109:61616?wireFormat.maxInactivityDuration=0 password: admin user: admin diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/CallItemController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/CallItemController.java index df56abf3..4b9a89e7 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/CallItemController.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/CallItemController.java @@ -147,7 +147,7 @@ public class CallItemController { @ResponseBody @PostMapping("/cancelCallItem") - public R cancelCallItem(@RequestBody List callItemNoList) { + public R cancelCallItem(@RequestBody List callItemNoList) { try { String site = CommonMethods.getSite(); String user = CommonMethods.getUser(); @@ -162,6 +162,23 @@ public class CallItemController { return R.ok("取消叫料成功"); } + @ResponseBody + @PostMapping("/refreshCallItem") + public R refreshCallItem(@RequestBody List callItemList) { + try { + String site = CommonMethods.getSite(); + String user = CommonMethods.getUser(); + if (callItemList == null || callItemList.size() <= 0) { + throw BusinessException.build("请至少选择一笔记录"); + } + callItemService.refreshCallItem(site, user, callItemList); + } catch (Exception e) { + return R.failed(e.getMessage()); + } + + return R.ok("刷新叫料明细成功"); + } + @ResponseBody @PostMapping("/refreshRequiredTime") public R refreshRequiredTime(@RequestBody List callItemNoList) { diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java index f4a3cdfa..cc086aec 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java @@ -72,38 +72,38 @@ public class SfcDispatchController { public R getSfcDispatch(String workCenter, String dispatchStatus, String item, String itemNumber, String workOrder, String shopOrder, String resrce, String resourceType, String operation, String sfc, String component, String componentDescription, String turnOperation, String isDispatch, String startFromDate_S, String startToDate_S, String completeFromDate_S, String completeToDate_S) { - List list; + List list; try { - ShopOrderRelease shopOrderRelease = new ShopOrderRelease(); - shopOrderRelease.setSite(CommonMethods.getSite()); - shopOrderRelease.setWorkCenter(workCenter); - shopOrderRelease.setDispatchStatus(dispatchStatus); - shopOrderRelease.setItem(item); - shopOrderRelease.setItemNumber(itemNumber); - shopOrderRelease.setWorkOrder(workOrder); - shopOrderRelease.setShopOrder(shopOrder); - shopOrderRelease.setResrce(resrce); - shopOrderRelease.setResourceType(resourceType); - shopOrderRelease.setOperation(operation); - shopOrderRelease.setSfc(sfc); - shopOrderRelease.setComponent(component); - shopOrderRelease.setComponentDescription(componentDescription); - shopOrderRelease.setTurnOperation(turnOperation); - shopOrderRelease.setIsDispatch(isDispatch); + SfcDispatchDto sfcDispatchDto = new SfcDispatchDto(); + sfcDispatchDto.setSite(CommonMethods.getSite()); + sfcDispatchDto.setWorkCenter(workCenter); + sfcDispatchDto.setDispatchStatus(dispatchStatus); + sfcDispatchDto.setItem(item); + sfcDispatchDto.setItemNumber(itemNumber); + sfcDispatchDto.setWorkOrder(workOrder); + sfcDispatchDto.setShopOrder(shopOrder); + sfcDispatchDto.setResrce(resrce); + sfcDispatchDto.setResourceType(resourceType); + sfcDispatchDto.setOperation(operation); + sfcDispatchDto.setSfc(sfc); + sfcDispatchDto.setComponent(component); + sfcDispatchDto.setComponentDescription(componentDescription); + sfcDispatchDto.setTurnOperation(turnOperation); + sfcDispatchDto.setIsDispatch(isDispatch); if (startFromDate_S != null) { - shopOrderRelease.setStartFromDate(DateUtil.parse(startFromDate_S)); + sfcDispatchDto.setStartFromDate(DateUtil.parse(startFromDate_S)); } if (startToDate_S != null) { - shopOrderRelease.setStartToDate(DateUtil.parse(startToDate_S)); + sfcDispatchDto.setStartToDate(DateUtil.parse(startToDate_S)); } if (completeFromDate_S != null) { - shopOrderRelease.setCompleteFromDate(DateUtil.parse(completeFromDate_S)); + sfcDispatchDto.setCompleteFromDate(DateUtil.parse(completeFromDate_S)); } if (completeToDate_S != null) { - shopOrderRelease.setCompleteToDate(DateUtil.parse(completeToDate_S)); + sfcDispatchDto.setCompleteToDate(DateUtil.parse(completeToDate_S)); } - list = sfcDispatchService.findSfcDispatchList(shopOrderRelease); + list = sfcDispatchService.findSfcDispatchList(sfcDispatchDto); } catch (Exception e) { return R.failed(e.getMessage()); } @@ -114,29 +114,29 @@ public class SfcDispatchController { /** * 查询派工数据 * - * @param shopOrderRelease + * @param sfcDispatchDto * @return */ @ResponseBody @PostMapping("findSfcDispatch") - public R findSfcDispatch(@RequestBody ShopOrderRelease shopOrderRelease) { - List list; + public R findSfcDispatch(@RequestBody SfcDispatchDto sfcDispatchDto) { + List list; try { - shopOrderRelease.setSite(CommonMethods.getSite()); - if (shopOrderRelease.getStartFromDate_S() != null) { - shopOrderRelease.setStartFromDate(DateUtil.parse(shopOrderRelease.getStartFromDate_S())); + sfcDispatchDto.setSite(CommonMethods.getSite()); + if (sfcDispatchDto.getStartFromDate_S() != null) { + sfcDispatchDto.setStartFromDate(DateUtil.parse(sfcDispatchDto.getStartFromDate_S())); } - if (shopOrderRelease.getStartToDate_S() != null) { - shopOrderRelease.setStartToDate(DateUtil.parse(shopOrderRelease.getStartToDate_S())); + if (sfcDispatchDto.getStartToDate_S() != null) { + sfcDispatchDto.setStartToDate(DateUtil.parse(sfcDispatchDto.getStartToDate_S())); } - if (shopOrderRelease.getCompleteFromDate_S() != null) { - shopOrderRelease.setCompleteFromDate(DateUtil.parse(shopOrderRelease.getCompleteFromDate_S())); + if (sfcDispatchDto.getCompleteFromDate_S() != null) { + sfcDispatchDto.setCompleteFromDate(DateUtil.parse(sfcDispatchDto.getCompleteFromDate_S())); } - if (shopOrderRelease.getCompleteToDate_S() != null) { - shopOrderRelease.setCompleteToDate(DateUtil.parse(shopOrderRelease.getCompleteToDate_S())); + if (sfcDispatchDto.getCompleteToDate_S() != null) { + sfcDispatchDto.setCompleteToDate(DateUtil.parse(sfcDispatchDto.getCompleteToDate_S())); } - list = sfcDispatchService.findSfcDispatchList(shopOrderRelease); + list = sfcDispatchService.findSfcDispatchList(sfcDispatchDto); } catch (Exception e) { return R.failed(e.getMessage()); } @@ -330,24 +330,24 @@ public class SfcDispatchController { @PostMapping("/gantt-list") - public R ganttList(@RequestBody ShopOrderRelease shopOrderRelease) { + public R ganttList(@RequestBody SfcDispatchDto sfcDispatchDto) { Map result = new HashMap<>(); try { String site = CommonMethods.getSite(); - if (StringUtil.isBlank(shopOrderRelease.getStartFromDate_S())) { + if (StringUtil.isBlank(sfcDispatchDto.getStartFromDate_S())) { throw BusinessException.build("派工开始时间不能为空！"); } - if (StringUtil.isBlank(shopOrderRelease.getStartToDate_S())) { + if (StringUtil.isBlank(sfcDispatchDto.getStartToDate_S())) { throw BusinessException.build("派工开始时间不能为空！"); } - shopOrderRelease.setSite(site); - shopOrderRelease.setDispatchStatus(DispatchStatusEnum.RELEASE.getCode()); - shopOrderRelease.setStartFromDate(DateUtil.parseDate(shopOrderRelease.getStartFromDate_S())); - shopOrderRelease.setStartToDate(DateUtil.parseDate(shopOrderRelease.getStartToDate_S())); + sfcDispatchDto.setSite(site); + sfcDispatchDto.setDispatchStatus(DispatchStatusEnum.RELEASE.getCode()); + sfcDispatchDto.setStartFromDate(DateUtil.parseDate(sfcDispatchDto.getStartFromDate_S())); + sfcDispatchDto.setStartToDate(DateUtil.parseDate(sfcDispatchDto.getStartToDate_S())); - result = sfcDispatchService.ganttList(site, shopOrderRelease); + result = sfcDispatchService.ganttList(site, sfcDispatchDto); } catch (Exception e) { return R.failed(e.getMessage()); } diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/dto/IssueItemDto.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/dto/IssueItemDto.java index 122d9eb3..b9629770 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/dto/IssueItemDto.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/dto/IssueItemDto.java @@ -7,6 +7,7 @@ public class IssueItemDto implements Serializable { private String site; private String item; + private String workOrder; private String resource; private String workCenter; private String shopOrder; @@ -31,6 +32,14 @@ public class IssueItemDto implements Serializable { this.item = item; } + public String getWorkOrder() { + return workOrder; + } + + public void setWorkOrder(String workOrder) { + this.workOrder = workOrder; + } + public String getResource() { return resource; } diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/CallItemMapper.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/CallItemMapper.java index a0d79805..f92639c7 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/CallItemMapper.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/CallItemMapper.java @@ -36,7 +36,7 @@ public interface CallItemMapper extends BaseMapper { List findCallItemDetailListByDispatchBo(@Param("site") String site, @Param("list") List list); - void updateCallItemStatusByDispatchBo(@Param("status") String status, @Param("user") String user, @Param("dateTime") LocalDateTime dateTime, @Param("list") List list); + void updateCallItemStatusByDispatchBo(@Param("status") String status, @Param("user") String user, @Param("dateTime") LocalDateTime dateTime, @Param("list") List list); void updateCallItemStatusByCallItemNo(@Param("status") String status, @Param("user") String user, @Param("dateTime") LocalDateTime dateTime, @Param("list") List list); diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java index 8334a760..5677a8d9 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java @@ -27,10 +27,10 @@ public interface SfcDispatchMapper extends BaseMapper { /** * 查询派工生产批次数据 * - * @param shopOrderRelease + * @param sfcDispatchDto * @return */ - List findSfcDispatchList(ShopOrderRelease shopOrderRelease); + List findSfcDispatchList(SfcDispatchDto sfcDispatchDto); /** * 修改派工单状态 diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/CallItem.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/CallItem.java index 73baaad9..2fefe482 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/CallItem.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/CallItem.java @@ -138,6 +138,8 @@ public class CallItem extends Model { @TableField(exist = false) private String item; @TableField(exist = false) + private String itemGroup; + @TableField(exist = false) private String component; @TableField(exist = false) private String itemDescription; @@ -170,6 +172,10 @@ public class CallItem extends Model { @TableField(exist = false) private String remark; @TableField(exist = false) + private BigDecimal sizeReqQty; + @TableField(exist = false) + private BigDecimal compReqQty; + @TableField(exist = false) private String startFromDate_S; @TableField(exist = false) private String startToDate_S; @@ -362,6 +368,14 @@ public class CallItem extends Model { this.item = item; } + public String getItemGroup() { + return itemGroup; + } + + public void setItemGroup(String itemGroup) { + this.itemGroup = itemGroup; + } + public String getComponent() { return component; } @@ -490,6 +504,22 @@ public class CallItem extends Model { this.remark = remark; } + public BigDecimal getSizeReqQty() { + return sizeReqQty; + } + + public void setSizeReqQty(BigDecimal sizeReqQty) { + this.sizeReqQty = sizeReqQty; + } + + public BigDecimal getCompReqQty() { + return compReqQty; + } + + public void setCompReqQty(BigDecimal compReqQty) { + this.compReqQty = compReqQty; + } + public String getStartFromDate_S() { return startFromDate_S; } diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/ShopOrderRelease.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/ShopOrderRelease.java index 98e9eac0..2249737c 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/ShopOrderRelease.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/ShopOrderRelease.java @@ -61,7 +61,6 @@ public class ShopOrderRelease extends SfcDispatch { private String operationDescription; private String isCompleted; private BigDecimal completedQty; - private String userName; private String resourceWorkCenter; private LocalDateTime dispatchCompleteDate; @@ -231,14 +230,6 @@ public class ShopOrderRelease extends SfcDispatch { this.resourceWorkCenter = resourceWorkCenter; } - public String getUserName() { - return userName; - } - - public void setUserName(String userName) { - this.userName = userName; - } - public LocalDateTime getDispatchCompleteDate() { return dispatchCompleteDate; } diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/CallItemService.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/CallItemService.java index 47f282ad..ce714f19 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/CallItemService.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/CallItemService.java @@ -85,7 +85,16 @@ public interface CallItemService extends IService { * @param user * @param callItemNoList */ - void cancelCallItem(String site, String user, List callItemNoList); + void cancelCallItem(String site, String user, List callItemNoList); + + /** + * 刷新叫料明细 + * + * @param site + * @param user + * @param callItemList + */ + void refreshCallItem(String site, String user, List callItemList); /** * 刷新需求时间 @@ -96,6 +105,14 @@ public interface CallItemService extends IService { */ void refreshRequiredTime(String site, String user, List callItemNoList); + /** + * 更新叫料单状态 + * + * @param user + * @param status + * @param list + */ + void updateCallItemStatusByDispatchBo(String status, String user, List list); //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /** diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/ItemBatchService.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/ItemBatchService.java index 6074e1c7..14d67bbc 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/ItemBatchService.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/ItemBatchService.java @@ -28,4 +28,7 @@ public interface ItemBatchService extends IService { * @return */ List findItemBatch(String site, String item, String batch); + + + List findItemLabel(String site, String item, String label); } \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SfcDispatchService.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SfcDispatchService.java index 1c8f15db..5da332d7 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SfcDispatchService.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SfcDispatchService.java @@ -34,10 +34,10 @@ public interface SfcDispatchService extends IService { /** * 查询派工清单 * - * @param shopOrderRelease + * @param sfcDispatchDto * @return */ - List findSfcDispatchList(ShopOrderRelease shopOrderRelease); + List findSfcDispatchList(SfcDispatchDto sfcDispatchDto); /** * 派工保存 @@ -106,8 +106,8 @@ public interface SfcDispatchService extends IService { * 甘特图数据查询 * * @param site - * @param shopOrderRelease + * @param sfcDispatchDto * @return */ - Map ganttList(String site, ShopOrderRelease shopOrderRelease); + Map ganttList(String site, SfcDispatchDto sfcDispatchDto); } \ No newline at end of file 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 5b67bb0c..e9ad3806 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 @@ -17,6 +17,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; @@ -80,8 +81,6 @@ public class CallItemServiceImpl extends ServiceImpl i callItem.setRequiredQty(sfcDispatchDto.getDispatchQty()); callItem.setRequiredDateTime(sfcDispatchDto.getPlannedStartDate()); callItem.setStatus(Constants.CALL_ITEM_STATUS_NEW); - callItem.setCallStatus(Constants.CALL_ITEM_STATUS_NEW); - callItem.setIssueStatus(Constants.CALL_ITEM_STATUS_NEW); callItem.setCreateUser(user); callItem.setCreatedDateTime(nowDate); callItem.setModifyUser(user); @@ -101,8 +100,6 @@ 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.setCallStatus(Constants.CALL_ITEM_STATUS_NEW); - callItem.setIssueStatus(Constants.CALL_ITEM_STATUS_NEW); callItem.setCreateUser(user); callItem.setCreatedDateTime(nowDate); callItem.setModifyUser(user); @@ -143,8 +140,13 @@ public class CallItemServiceImpl extends ServiceImpl i return; } - LocalDateTime dateTime = LocalDateTime.now(); - callItemMapper.updateCallItemStatusByDispatchBo(Constants.CALL_ITEM_STATUS_CALLED, user, dateTime, callItemList); + //派工单号集合 + List dispatchBoList = new ArrayList<>(); + for (CallItem callItem : callItemList) { + dispatchBoList.add(callItem.getSfcDispatchBo()); + } + + this.updateCallItemStatusByDispatchBo(Constants.CALL_ITEM_STATUS_CALLED, user, dispatchBoList); } @Override @@ -153,6 +155,8 @@ public class CallItemServiceImpl extends ServiceImpl i return; } + //派工单号集合 + List dispatchBoList = new ArrayList<>(); for (CallItem callItem : callItemList) { String sfcDispatchBo = callItem.getSfcDispatchBo(); List list = callItemMapper.selectCallItemAndType(sfcDispatchBo); @@ -167,20 +171,87 @@ public class CallItemServiceImpl extends ServiceImpl i throw BusinessException.build("勾选的派工单包含原材料组件，不能触发确认到料"); } } + + dispatchBoList.add(sfcDispatchBo); } - LocalDateTime dateTime = LocalDateTime.now(); - callItemMapper.updateCallItemStatusByDispatchBo(Constants.CALL_ITEM_STATUS_ISSUED, user, dateTime, callItemList); + this.updateCallItemStatusByDispatchBo(Constants.CALL_ITEM_STATUS_ISSUED, user, dispatchBoList); } @Override - public void cancelCallItem(String site, String user, List callItemNoList) { + public void cancelCallItem(String site, String user, List callItemNoList) { if (callItemNoList == null || callItemNoList.size() <= 0) { return; } + List callItemList = new ArrayList<>(); + for (CallItem callItem: callItemNoList) { + String status = callItem.getStatus(); + if (Constants.CALL_ITEM_STATUS_ISSUED.equals(status)) { + throw BusinessException.build("领料单号【" +callItem.getCallItemNo()+ "】已发料，不允许取消！"); + } + + callItemList.add(callItem.getCallItemNo()); + } + LocalDateTime dateTime = LocalDateTime.now(); - callItemMapper.updateCallItemStatusByCallItemNo(Constants.CALL_ITEM_STATUS_CANCELED, user, dateTime, callItemNoList); + callItemMapper.updateCallItemStatusByCallItemNo(Constants.CALL_ITEM_STATUS_CANCELED, user, dateTime, callItemList); + } + + @Override + public void refreshCallItem(String site, String user, List callItemList) { + if (callItemList == null || callItemList.size() <= 0) { + return; + } + + List sfcDispatchList = new ArrayList<>(); + for (CallItem callItem: callItemList) { + SfcDispatchDto sfcDispatchDto = new SfcDispatchDto(); + sfcDispatchDto.setHandle(callItem.getSfcDispatchBo()); + sfcDispatchList.add(sfcDispatchDto); + } + List list = callItemMapper.selectDispatchCallItem(sfcDispatchList); + if (list == null || list.size() <= 0) { + return; + } + + //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + LocalDateTime nowDate = LocalDateTime.now(); + List addList = new ArrayList<>(); + List modList = new ArrayList<>(); + for (int i = 0; i < list.size(); i++) { + CallItem callItem = list.get(i); + String handle = callItem.getHandle(); + BigDecimal reqQty = callItem.getRequiredQty(); + if (reqQty.compareTo(BigDecimal.ZERO) == 1) { + if (StringUtil.isBlank(handle)) { + String component = StringUtil.trimHandle(callItem.getComponentBo()); + String callItemNo = callItem.getSfc() + callItem.getStepId() + component; + + callItem.setCallItemNo(callItemNo); + callItem.setHandle(HandleEnum.CALL_ITEM.getHandle(site, callItemNo)); + callItem.setCallType(Constants.CALL_TYPE_MATERIAL); + callItem.setStatus(Constants.CALL_ITEM_STATUS_NEW); + callItem.setCreateUser(user); + callItem.setCreatedDateTime(nowDate); + callItem.setModifyUser(user); + callItem.setModifiedDateTime(nowDate); + addList.add(callItem); + } else { + callItem.setRequiredQty(callItem.getIssueQty()); + callItem.setModifyUser(user); + callItem.setModifiedDateTime(nowDate); + modList.add(callItem); + } + } + } + + if (addList != null && addList.size() > 0) { + this.saveBatch(addList); + } + if (modList != null && modList.size() > 0) { + this.updateBatchById(modList); + } } @Override @@ -194,6 +265,12 @@ public class CallItemServiceImpl extends ServiceImpl i callItemMapper.refreshRequiredTime(user, dateTime, callItemNoList); } + @Override + public void updateCallItemStatusByDispatchBo(String status, String user, List list) { + LocalDateTime dateTime = LocalDateTime.now(); + callItemMapper.updateCallItemStatusByDispatchBo(status, user, dateTime, list); + } + //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @Override @@ -203,10 +280,64 @@ public class CallItemServiceImpl extends ServiceImpl i @Override public List findIssueItemList(IssueItemDto issueItemDto) { + List list; if (issueItemDto.getMatchResource()) { - return callItemMapper.finsIssueItemListToResource(issueItemDto); + list = callItemMapper.finsIssueItemListToResource(issueItemDto); } else { - return callItemMapper.finsIssueItemListNoResource(issueItemDto); + list = callItemMapper.finsIssueItemListNoResource(issueItemDto); + } + + if (list == null || list.size() <= 0) { + return list; + } + + //计算合计(按下料尺寸) + //物料组为GB(钢板)：合计=下料尺寸*号最后两位相乘*需求数量 + //其他物料: 合计：下料尺寸*号最后一位*需求数量 + Map compQtyMap = new HashMap<>(); + for (CallItem callItem: list) { + String component = callItem.getItem(); + String itemGroup = callItem.getItemGroup(); + BigDecimal reqQty = callItem.getRequiredQty(); + String blankingSize = callItem.getBlankingSize(); + + //工序叫料不需要计算数量 + if (Constants.CALL_TYPE_OPERATION.equals(callItem.getCallType())) { + callItem.setSizeReqQty(BigDecimal.ONE); + compQtyMap.put(component, BigDecimal.ONE); + continue; + } + + if ("GB".equals(itemGroup) && blankingSize.contains("*")) { + String []size = blankingSize.split("/*"); + if (size != null && size.length >= 2) { + int sizeLength = size.length; + BigDecimal length = new BigDecimal(size[sizeLength-1]); + BigDecimal width = new BigDecimal(size[sizeLength-2]); + BigDecimal sizeReqQty = length.multiply(width).multiply(reqQty); + callItem.setSizeReqQty(sizeReqQty); + + //按物料汇总需求数量 + compQtyMap.put(component, (compQtyMap.get(component) != null ? compQtyMap.get(component).add(sizeReqQty) : sizeReqQty)); + } + } else { + String []size = blankingSize.split("/*"); + if (size != null && size.length >= 1) { + int sizeLength = size.length; + BigDecimal length = new BigDecimal(size[sizeLength-1]); + BigDecimal sizeReqQty = length.multiply(reqQty); + callItem.setSizeReqQty(sizeReqQty); + + //按物料汇总需求数量 + compQtyMap.put(component, (compQtyMap.get(component) != null ? compQtyMap.get(component).add(sizeReqQty) : sizeReqQty)); + } + } + } + + //计算总数量(按数量汇总) + for (CallItem callItem : list) { + callItem.setCompReqQty(compQtyMap.get(callItem.getItem())); } + return list; } } \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/IssueItemServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/IssueItemServiceImpl.java index bf25e531..b6484739 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/IssueItemServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/IssueItemServiceImpl.java @@ -89,7 +89,7 @@ public class IssueItemServiceImpl extends ServiceImpl itemBatchList = itemBatchService.findItemBatch(site, item, inventory); + List itemBatchList = itemBatchService.findItemLabel(site, item, inventory); if (itemBatchList == null || itemBatchList.size() <= 0) { throw BusinessException.build("扫描的物料条码【 "+ inventory +" 】不存在！"); } @@ -178,10 +178,12 @@ public class IssueItemServiceImpl extends ServiceImpl itemBatchList = itemBatchService.findItemBatch(site, item, inventory); + List itemBatchList = itemBatchService.findItemLabel(site, item, inventory); if (itemBatchList == null || itemBatchList.size() <= 0) { throw BusinessException.build("扫描的物料条码【 " + inventory + " 】不存在！"); } + String batch = itemBatchList.get(0).getBatch(); + String supplier = itemBatchList.get(0).getSupplier(); try { //查询库存是否存在 @@ -195,6 +197,20 @@ public class IssueItemServiceImpl extends ServiceImpl inventoryDataFieldList = new ArrayList<>(); + InventoryDataField dataField = new InventoryDataField(); + dataField.setAttribute("BATCH_NUMBER"); + dataField.setValue(batch); + inventoryDataFieldList.add(dataField); + + dataField = new InventoryDataField(); + dataField.setAttribute("VENDOR_NAME"); + dataField.setValue(supplier); + inventoryDataFieldList.add(dataField); + request.setAssemblyDataList(inventoryDataFieldList); + meInventoryService.validateAndAdd(request); } else { issueInvQty = issueInvQty.add(inventoryModel.getQtyOnHand()); diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ItemBatchServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ItemBatchServiceImpl.java index 70881586..5473dcb4 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ItemBatchServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ItemBatchServiceImpl.java @@ -41,7 +41,19 @@ public class ItemBatchServiceImpl extends ServiceImpl findItemLabel(String site, String item, String label) { + Map queryMap = new HashMap<>(); + queryMap.put(ItemBatch.SITE, site); + queryMap.put(ItemBatch.ITEM, item); + if (StringUtil.notBlank(label)) { + queryMap.put(ItemBatch.LABEL, label); } return itemBatchMapper.selectByMap(queryMap); diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java index 57b4016a..52010faa 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java @@ -85,8 +85,8 @@ public class SfcDispatchServiceImpl extends ServiceImpl findSfcDispatchList(ShopOrderRelease shopOrderRelease) { - return sfcDispatchMapper.findSfcDispatchList(shopOrderRelease); + public List findSfcDispatchList(SfcDispatchDto sfcDispatchDto) { + return sfcDispatchMapper.findSfcDispatchList(sfcDispatchDto); } @Override @@ -184,6 +184,7 @@ public class SfcDispatchServiceImpl extends ServiceImpl list = new ArrayList<>(); + List dispatchBoList = new ArrayList<>(); for (SfcDispatchDto sfcDispatchDto : sfcDispatchList) { String sfcDispatchBo = sfcDispatchDto.getHandle(); String shopOrder = sfcDispatchDto.getShopOrder(); @@ -209,12 +210,17 @@ public class SfcDispatchServiceImpl extends ServiceImpl 0) { this.updateBatchById(list); } + //取消叫料数据 + callItemService.updateCallItemStatusByDispatchBo(Constants.CALL_ITEM_STATUS_CANCELED, user, dispatchBoList); + //取消产前准备任务 prodReadyTaskService.createTask(sfcDispatchList); } @@ -242,11 +248,11 @@ public class SfcDispatchServiceImpl extends ServiceImpl ganttList(String site, ShopOrderRelease shopOrderRelease) { + public Map ganttList(String site, SfcDispatchDto sfcDispatchDto) { Map map = new HashMap<>(); //查询派工数据 - List scheduleList = this.findSfcDispatchList(shopOrderRelease); + List scheduleList = this.findSfcDispatchList(sfcDispatchDto); if (scheduleList == null || scheduleList.size() <= 0) { return map; } @@ -259,7 +265,7 @@ public class SfcDispatchServiceImpl extends ServiceImpl>> processedMap = this.processWorkCenterWorkTimes(site, workCenterList, shopOrderRelease.getStartFromDate(), shopOrderRelease.getStartToDate()); + Map>> processedMap = this.processWorkCenterWorkTimes(site, workCenterList, sfcDispatchDto.getStartFromDate(), sfcDispatchDto.getStartToDate()); map.put("workCenterWorkTimes", processedMap); return map; @@ -428,7 +434,7 @@ public class SfcDispatchServiceImpl extends ServiceImpl + @@ -595,7 +596,7 @@ @@ -607,7 +608,7 @@ diff --git a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml index 9c6bc92a..87c458b0 100644 --- a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml +++ b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml @@ -51,7 +51,7 @@ - + @@ -63,7 +63,6 @@ - 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 8e53c177..6023b996 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,8 +1,10 @@ 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; import com.foreverwin.mesnac.common.enums.HandleEnum; import com.foreverwin.mesnac.common.model.PrintLog; import com.foreverwin.mesnac.common.service.PrintLogService; @@ -431,6 +433,9 @@ public class InterfaceServiceImpl implements InterfaceService { * 3.MES资源类型=MES工序 */ String erpWorkCenter = componentDto.getOPERATION(); + if (StringUtil.isBlank(erpWorkCenter)) { + throw BusinessException.build("BOM节点下字段【OPERATION】不能为空！"); + } Operation operationModel = operationService.queryOperationByErpWorkCenter(site, erpWorkCenter); if (operationModel == null) { throw BusinessException.build("ERP工作中心【" +erpWorkCenter+"】对应的MES工序未维护"); @@ -517,7 +522,7 @@ public class InterfaceServiceImpl implements InterfaceService { String stepId = routerStepDto.getSTEP_ID(); String erpWorkCenter = routerStepDto.getOPERATION().trim(); if (StringUtil.isBlank(erpWorkCenter)) { - throw BusinessException.build("步骤标识【" +stepId+ "】下ERP工作中心不能为空"); + continue; } if (StringUtil.isBlank(entryRouterStep)) { @@ -835,21 +840,25 @@ public class InterfaceServiceImpl implements InterfaceService { } //打印模板参数 - JSONObject jsonObject = new JSONObject(); - jsonObject.put("ITEM", item); - jsonObject.put("ITEM_DESC", itemModel.getDescription()); - jsonObject.put("SUPPLIER", supplier); - jsonObject.put("INVENTORY", inventory); + List labelPrintDtoList = new ArrayList<>(); + LabelPrintDto labelPrintDto = new LabelPrintDto(); + labelPrintDto.setSite(site); + labelPrintDto.setPrintTemplate(Constants.PRINT_TYPE_INV); + labelPrintDto.setItem(item); + labelPrintDto.setItemDescription(itemModel.getDescription()); + labelPrintDto.setSupplier(supplier); + labelPrintDto.setBatch(inventory); + labelPrintDtoList.add(labelPrintDto); //记录打印数据 PrintLog printLog = new PrintLog(); printLog.setHandle(UUID.randomUUID().toString()); printLog.setSite(site); - printLog.setCategory("INV"); + printLog.setCategory(Constants.PRINT_TYPE_INV); printLog.setPrintName(""); - printLog.setPrintTemplate("INV_LABEL"); - printLog.setPrintParam(jsonObject.toJSONString()); + printLog.setPrintTemplate(Constants.PRINT_TYPE_INV); + printLog.setPrintParam(JSON.toJSONString(labelPrintDtoList)); printLog.setInventory(inventory); printLog.setItemBo(itemModel.getHandle()); printLog.setIsPrint("false"); diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java index 9db3c34e..abc1cc9d 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java @@ -183,7 +183,7 @@ public class ResrceController { List result; try { String site = CommonMethods.getSite(); - String [] userArray = new String[]{}; + String [] userArray = new String[1]; if (StringUtils.notBlank(user)) { if (user.contains(",")) { userArray = user.split(","); diff --git a/meapi/src/main/resources/mapper/ResrceMapper.xml b/meapi/src/main/resources/mapper/ResrceMapper.xml index 246dae4c..4bb9b417 100644 --- a/meapi/src/main/resources/mapper/ResrceMapper.xml +++ b/meapi/src/main/resources/mapper/ResrceMapper.xml @@ -599,7 +599,7 @@ From a46a0b8a347879e11044f74bedaf8ac0ec861abd Mon Sep 17 00:00:00 2001 From: zpl Date: Mon, 9 Aug 2021 08:23:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/common/constant/Constants.java | 2 + .../service/impl/PrintLogServiceImpl.java | 19 ++++++++- .../impl/SurplusReturnServiceImpl.java | 40 ++++++++++++++++++- 3 files changed, 59 insertions(+), 2 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 31e2ec81..1b000e8b 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 @@ -160,6 +160,8 @@ public interface Constants { String PRINT_TYPE_INV = "INV"; // 在制品标签 String PRINT_TYPE_SFC = "SFC"; + // 余料标签 + String PRINT_TYPE_EXM = "EXM"; /** * 刀具状态，Y-使用，N-报废/删除 diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java index 11a53c8a..d1f4a09e 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java @@ -61,14 +61,31 @@ public class PrintLogServiceImpl extends ServiceImpl i @Override public void labelPrint(String site, String user, List printList) { List labelPrintDtoList = new ArrayList<>(); + StringBuffer stringBuffer = new StringBuffer(""); for (PrintLog printLog : printList) { LabelPrintDto labelPrintDto = new LabelPrintDto(); + // 打印机名称、打印模板 labelPrintDto.setPrinter(printLog.getPrintName()); labelPrintDto.setPrintTemplate(printLog.getPrintTemplate()); + // {"ITEM":"500100010001","INVENTORY":"500100010001*20210721","ITEM_DESC":"测试物料","SUPPLIER":"BA002"} + // 打印参数：物料编号、物料描述、供应商、批次号 + String printParam = printLog.getPrintParam(); + JSONObject jsonObject = JSONObject.parseObject(printParam); + String item = jsonObject.getString("ITEM"); + String item_desc = jsonObject.getString("ITEM_DESC"); + String supplier = jsonObject.getString("SUPPLIER"); + String inventory = jsonObject.getString("INVENTORY"); + labelPrintDto.setItem(item); + labelPrintDto.setItemDescription(item_desc); + labelPrintDto.setSupplier(supplier); + labelPrintDto.setBatch(inventory); + /* labelPrintDto.setItem(printLog.getItem()); - labelPrintDto.setItemDescription(printLog.getItemDescription()); + labelPrintDto.setItemDescription(printLog.getItemDescription());*/ labelPrintDtoList.add(labelPrintDto); + stringBuffer.append(printParam).append(","); } + String jsonList = JSON.toJSONString(labelPrintDtoList); String post = HttpUtil.post(printServer, JSON.toJSONString(labelPrintDtoList), 30000); /** * {"msg":"打印成功","code":0} 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 b1a578b6..8f25066c 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 @@ -1,12 +1,17 @@ package com.foreverwin.mesnac.dispatch.service.impl; +import com.alibaba.fastjson.JSONObject; +import com.foreverwin.mesnac.common.constant.Constants; import com.foreverwin.mesnac.common.enums.HandleEnum; +import com.foreverwin.mesnac.common.model.PrintLog; +import com.foreverwin.mesnac.common.service.PrintLogService; import com.foreverwin.mesnac.common.util.ExceptionUtil; import com.foreverwin.mesnac.common.util.NumberUtil; import com.foreverwin.mesnac.common.util.StringUtil; import com.foreverwin.mesnac.dispatch.model.SurplusInventory; import com.foreverwin.mesnac.dispatch.service.SurplusInventoryService; import com.foreverwin.mesnac.meapi.model.Inventory; +import com.foreverwin.mesnac.meapi.model.InventoryAssyData; import com.foreverwin.mesnac.meapi.service.InventoryAssyDataService; import com.foreverwin.mesnac.meapi.service.InventoryService; import com.foreverwin.modular.core.exception.BusinessException; @@ -51,7 +56,10 @@ public class SurplusReturnServiceImpl extends ServiceImpl getInventoryData(String site, String inventory) { @@ -181,5 +189,35 @@ public class SurplusReturnServiceImpl extends ServiceImpl inventoryAssyDataList = inventoryAssyDataService.selectList(inventoryAssyData); + if (inventoryAssyDataList.size() == 1){ + jsonObject.put("SUPPLIER", inventoryAssyDataList.get(0).getDataAttr()); // 供应商 + }else { + throw BusinessException.build("未正确找到当前批次的供应商！"); + } + jsonObject.put("INVENTORY", surplusInventory); // 批次号 + printLog.setPrintParam(jsonObject.toString()); + printLog.setInventory(surplusInventory); + printLog.setItemBo(inventoryModel.getItemBo()); + //printLog.setIsPrint("false"); + printLog.setCreateUser(user); + printLog.setCreatedDateTime(dateTime); + printLogService.save(printLog); } } \ No newline at end of file