From acfbd1420910ca3a0844166822ed792be40c4e65 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期六, 18 九月 2021 10:40:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/ints/controller/ERPApiController.java | 36 ++++++++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 11 +++++++++++
2 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index a0cef33..b1d2c77 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -20,6 +20,7 @@
import com.zy.common.service.CommonService;
import com.zy.ints.entity.WaitMatchk;
import com.zy.ints.service.IoCompleteService;
+import com.zy.ints.service.WaitMatchkLogService;
import com.zy.ints.service.WaitMatchkService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -66,6 +67,8 @@
private WrkDetlLogService wrkDetlLogService;
@Autowired
private WaitMatchkService waitMatchkService;
+ @Autowired
+ private WaitMatchkLogService waitMatchkLogService;
@Autowired
private IoCompleteService ioCompleteService;
@@ -197,6 +200,14 @@
for (LocDetlDto locDetlDto : locDetlDtos) {
// String replace = UUID.randomUUID().toString().replace("-", "");
LocDetl locDetl = locDetlDto.getLocDetl();
+
+ //////鎻掑叆鐩樼偣妗ｅ墠锛屽皢閫氱煡妗ｄ箣鍓嶇浉鍚屽簱浣嶆暟鎹浆鍘嗗彶妗�
+ List<WaitMatchk> waitMatchks = waitMatchkService.selectList(new EntityWrapper<WaitMatchk>().eq("loc_no",locDetl.getLocNo()));
+ for(WaitMatchk one : waitMatchks){
+ waitMatchkLogService.save(one.getBillNo(),one.getLocNo(),one.getMatNo());
+ waitMatchkService.delete(new EntityWrapper<WaitMatchk>().eq("bill_no",one.getBillNo()).eq("loc_no",one.getLocNo()).eq("mat_no",one.getMatNo()));
+ }
+
//鐢熸垚鐩樼偣妗�
WaitMatchk waitMatchk = new WaitMatchk();
waitMatchk.setBillNo(billNo);//璁㈠崟缂栧彿
diff --git a/src/main/java/com/zy/ints/controller/ERPApiController.java b/src/main/java/com/zy/ints/controller/ERPApiController.java
new file mode 100644
index 0000000..d8abcc9
--- /dev/null
+++ b/src/main/java/com/zy/ints/controller/ERPApiController.java
@@ -0,0 +1,36 @@
+package com.zy.ints.controller;
+
+import com.core.annotations.ManagerAuth;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 鎻愪緵API鎺ュ彛渚汦RP璋冪敤锛屼笅鍙戜换鍔″崟鎹�
+ * Created by TQS on 2021/9/14
+ */
+@RestController
+@RequestMapping("erp")
+public class ERPApiController extends BaseController {
+
+ @RequestMapping("/waitIn/auth")
+ @ManagerAuth(memo = "ERP涓嬪彂鍏ュ簱鍗�")
+ public R getWaitMatin(@RequestBody String param){
+ return R.ok().add("");
+ }
+
+ @RequestMapping("/waitOut/auth")
+ @ManagerAuth(memo = "ERP涓嬪彂鍑哄簱鍗�")
+ public R getWaitMatout(@RequestBody String param){
+ return R.ok().add("");
+ }
+
+ @RequestMapping("/matCode/auth")
+ @ManagerAuth(memo = "ERP涓嬪彂鐗╂枡鍩虹鏁版嵁")
+ public R getMatCode(@RequestBody String param){
+ return R.ok().add("");
+ }
+
+}
--
Gitblit v1.9.1