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 81798a82..4c084ac3 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 @@ -41,6 +41,8 @@ public class LabelPrintDto implements Serializable { private String blankingSize; //下道工序 private String operation; + //打印张数 + private Integer printNum; public String getSite() { return site; @@ -161,4 +163,12 @@ public class LabelPrintDto implements Serializable { public void setOperation(String operation) { this.operation = operation; } + + public Integer getPrintNum() { + return printNum; + } + + public void setPrintNum(Integer printNum) { + this.printNum = printNum; + } } 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 8856c3dc..1f6a41fc 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 @@ -13,6 +13,7 @@ import com.foreverwin.mesnac.common.service.PrintLogService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.foreverwin.modular.core.exception.BusinessException; import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Propagation; @@ -70,6 +71,7 @@ public class PrintLogServiceImpl extends ServiceImpl i for (int i = 0; i < list.size(); i++) { list.get(i).setPrinter(printList.get(i).getPrintName()); list.get(i).setPrintTemplate(printList.get(i).getPrintTemplate()); + list.get(i).setPrintNum(printList.get(i).getPrintNum()); } String post = HttpUtil.post(printServer, JSON.toJSONString(list), 60000); /** @@ -91,10 +93,11 @@ public class PrintLogServiceImpl extends ServiceImpl i printLogOne.setHandle(printLog.getHandle()); printLogOne.setIsPrint("true"); Integer printNum = printLog.getPrintNum(); - if (printNum == null){ - printLogOne.setPrintNum(1); + String getOther1 = printLog.getOther1(); + if (getOther1 == null){ + printLogOne.setOther1("1"); }else { - printLogOne.setPrintNum(printNum+1); + printLogOne.setOther1(String.valueOf(Integer.valueOf(getOther1) + printNum)); } if (!printLog.getCategory().equals(Constants.PRINT_TYPE_SFC)){ printLogOne.setPrintName(printLog.getPrintName()); @@ -109,4 +112,13 @@ public class PrintLogServiceImpl extends ServiceImpl i public List getPrintLogListByCondition(PrintLog printLog) { return printLogMapper.getPrintLogListByCondition(printLog); } + + @Scheduled(cron = "0 0/3 20 * * ? ") + public void myTask(){ + List list = printLogService.list(); + for (PrintLog printLog:list) { + printLog.setModifiedDateTime(LocalDateTime.now()); + } + printLogService.updateBatchById(list); + } } \ No newline at end of file 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 e1923ce6..875a5288 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 @@ -287,9 +287,19 @@ public class CallItemController { return R.ok(result); } + + /** + * pda查询车间需要发料的发料数据 + * @param workCenter + * @param resource + * @param requiredFromDate + * @param requiredToDate + * @param matchResource + * @return + */ @ResponseBody @GetMapping("/findIssueItemListPda") - public R findIssueItemListPda(String workCenter, String resource, String requiredFromDate, String requiredToDate, Boolean matchResource) { + public R findIssueItemListPda(String workCenter, String resource, String item,String requiredFromDate, String requiredToDate, Boolean matchResource) { List result; try { String site = CommonMethods.getSite(); @@ -300,6 +310,7 @@ public class CallItemController { issueItemDto.setResource(resource); issueItemDto.setWorkCenter(workCenter); issueItemDto.setMatchResource(matchResource); + issueItemDto.setItem(item); if (StringUtil.notBlank(requiredFromDate)) { issueItemDto.setRequiredFromDT(LocalDate.parse(requiredFromDate, DateTimeFormatter.ISO_DATE)); }