From 754a5e27d05ad923514d56f082c9706ed5b6bb94 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Sat, 21 Aug 2021 14:05:13 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E5=8F=91=E6=96=99?=
=?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/dispatch/service/impl/IssueItemServiceImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 e2beb65d..f123c26d 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
@@ -341,7 +341,8 @@ public class IssueItemServiceImpl extends ServiceImpl<IssueItemMapper, IssueItem
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
//查询匹配的叫料记录
- List<CallItem> list = callItemService.findIssueMatchCallItemList(site, workOrder, blankingSize, resource, item);
+ // List<CallItem> list = callItemService.findIssueMatchCallItemList(site, workOrder, blankingSize, resource, item);
+ List<CallItem> list = callItemMapper.findIssueMatchCallItemListPda(site, workCenter, null, resource, item);
if (list == null || list.size() <= 0) {
throw BusinessException.build("根据发料数据未找到发料记录！");
}
From 6050a26fbace9cbddb3d872e6e1b61f6f5bd5ee1 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Sat, 21 Aug 2021 17:10:42 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BD=99=E6=96=99=E6=89=93=E5=8D=B0bug?=
=?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/dispatch/service/impl/SurplusReturnServiceImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 ddfd78e1..5270bf13 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
@@ -197,9 +197,10 @@ public class SurplusReturnServiceImpl extends ServiceImpl<SurplusReturnMapper, S
// {"ITEM":"500100010001","INVENTORY":"500100010001*20210721","ITEM_DESC":"测试物料","SUPPLIER":"BA002"}
PrintLog printLog = new PrintLog();
printLog.setHandle(UUID.randomUUID().toString());
- printLog.setSfc(site);
+ printLog.setSite(site);
printLog.setCategory(Constants.PRINT_TYPE_EXM);
printLog.setPrintTemplate(Constants.PRINT_TYPE_EXM);
+ printLog.setPrintNum(0);
// 查询供应商
InventoryAssyData inventoryAssyData = new InventoryAssyData();
inventoryAssyData.setInventoryBo(inventoryBo);
From 2bddd95c2840b3ff6f52bc9185724262e1a5f986 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Sun, 22 Aug 2021 20:55:36 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mesnac/common/dto/LabelPrintDto.java | 10 ++++++++++
.../service/impl/PrintLogServiceImpl.java | 18 +++++++++++++++---
.../controller/CallItemController.java | 13 ++++++++++++-
3 files changed, 37 insertions(+), 4 deletions(-)
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<PrintLogMapper, PrintLog> 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<PrintLogMapper, PrintLog> 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<PrintLogMapper, PrintLog> i
public List<PrintLog> getPrintLogListByCondition(PrintLog printLog) {
return printLogMapper.getPrintLogListByCondition(printLog);
}
+
+ @Scheduled(cron = "0 0/3 20 * * ? ")
+ public void myTask(){
+ List<PrintLog> 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<CallItem> 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));
}