From 7ff441cde857c41ae9908100de9c469ed5ab76be Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期一, 29 七月 2024 19:11:56 +0800
Subject: [PATCH] 视图sql
---
src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java | 2
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 1
src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java | 2
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 7 -
src/main/java/com/zy/asrs/controller/MobileController.java | 26 +++-----
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 4 -
src/main/java/com/zy/common/web/WcsController.java | 8 ++
src/main/java/asr_show_diff.sql | 87 ++++++++++++++++------------
8 files changed, 73 insertions(+), 64 deletions(-)
diff --git a/src/main/java/asr_show_diff.sql b/src/main/java/asr_show_diff.sql
index f06fdb0..35e983a 100644
--- a/src/main/java/asr_show_diff.sql
+++ b/src/main/java/asr_show_diff.sql
@@ -1,44 +1,57 @@
SELECT SUM
- ( asrsQty ) asrsQty,
- SUM ( erpQty ) erpQty,
- matnr,
- specs,
- maktx
+ ( asrsQty ) asrsQty,
+ SUM ( erpQty ) erpQty,
+ matnr,
+ maktx,
+ pgNo,
+ outOrderNo,
+ batch,
+ model ,specs
FROM
- (
- SELECT CAST
- ( SUM ( anfme ) AS INT ) asrsQty,
- 0 AS erpQty,
- matnr,
- specs,
- maktx
- FROM
- asr_loc_detl
- GROUP BY
- matnr,
- specs,
- maktx UNION ALL
- SELECT
- 0,
- CAST ( SUM ( numis ) AS INT ),
- itemid,
- itemcode,
- itemname
- FROM
- (
- SELECT
- *
- FROM
- OPENROWSET ( 'SQLOLEDB', '192.168.1.147,1800'; 'XGMLK'; 'xunda0413', XDLinkLK.dbo.vwErpLKStorage )
- WHERE
- LKName = '涓壃'
- ) a
+ (
+ SELECT CAST
+ ( SUM ( anfme ) AS INT ) asrsQty,
+ 0 AS erpQty,
+ matnr,
+ model,
+ maktx,
+ pg_no AS pgNo,
+ out_order_no AS outOrderNo,
+ batch ,specs
+ FROM
+ asr_loc_detl
+ GROUP BY
+ matnr,
+ maktx,
+ pg_no,
+ out_order_no,
+ batch,
+ model,specs UNION ALL
+ SELECT
+ 0,
+ CAST ( SUM ( numis ) AS INT ),
+ itemid,
+ itemcode,
+ itemname,
+ '' AS pgNo,
+ '' AS outOrderNo,
+ itembatch AS batch
+ ,itemSpc specs
+ FROM
+ ( SELECT * FROM OPENROWSET ( 'SQLOLEDB', '192.168.1.147,1800'; 'XGMLK'; 'xunda0413', XDLinkLK.dbo.vwErpLKStorage ) WHERE LKName = '涓壃浜屾湡' ) a
GROUP BY
itemid,
itemcode,
- itemname
- ) b WHERE 1=1 and matnr not in (select matnr from man_order_detl)
+ itemname,
+ itembatch ,itemSpc
+ ) b
+WHERE
+ 1 = 1
+ AND matnr NOT IN ( SELECT matnr FROM man_order_detl )
GROUP BY
matnr,
- specs,
- maktx
\ No newline at end of file
+ model,
+ maktx,
+ pgNo,
+ outOrderNo,
+ batch,specs
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index cff4b1d..4200c10 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -159,7 +159,6 @@
elem.setBatch(elem.getItemBatch());
}
});
- System.out.println(combParam);
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
@@ -428,12 +427,14 @@
@RequestMapping("/bill/query1/auth")
@ManagerAuth(memo = "鏍规嵁閫氱煡鍗曟煡璇㈡槑缁�")
public R billQuery1(@RequestParam String billNo, @RequestParam String size) {
- System.out.println("-------------------------");
- System.out.println(billNo);
- System.out.println(size);
- List<OrderDetl> waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("pg_no", billNo).like("model", size).last("and anfme > work_qty"));
-// List<WaitMatin> waitMatins = waitMatinService.selectList(new EntityWrapper<WaitMatin>().eq("bill_no", billNo).last("and qty > in_qty"));
-
+ Order temp1 = orderService.selectOne(new EntityWrapper<Order>().eq("temp1", billNo));
+ if (temp1 == null) {
+ throw new CoolException("璇ヨ鍗曚笉瀛樺湪");
+ }
+ List<OrderDetl> waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", temp1.getOrderNo()).like("model", size).last("and anfme > work_qty"));
+ if (waitMatins == null || waitMatins.isEmpty()) {
+ throw new CoolException("璇ヨ鍗曢」涓嶅瓨鍦�");
+ }
//濡傛灉閫氱煡鍗曞崟鍙蜂负绌猴紝鍒欐煡璇㈣皟鎷ㄥ崟鍙�
// if (Cools.isEmpty(waitMatins) || waitMatins.size() <= 0) {
// waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("temp1", billNo).like("size", size).last("and anfme > work_qty"));
@@ -456,17 +457,10 @@
vo.setItemBatch(waitMatin.getBatch());
//vo.setOveFlag(waitMatin.getOveFlag());
vos.add(vo);
- System.out.println(waitMatin.getAnfme());
- System.out.println(waitMatin.getWorkQty());
- System.out.println(vo);
-// 10.0
-// 0.0
-// CombBillQueryVo(billNo=ZJFLC2407280005, seqNo=1, matNo=41011659, matName=寮圭哀鐩�, specs=null, size=null, color=null, count=10.0, qty=0.0, unit=Pcs, type=null, itemBatch=, oveFlag=null)
-// 10.0
-// 0.0
-// CombBillQueryVo(billNo=ZJFLC2407280005, seqNo=2, matNo=4103020554, matName=鏀灦, specs=null, size=null, color=null, count=10.0, qty=0.0, unit=Pcs, type=null, itemBatch=, oveFlag=null)
}
}
return R.ok().add(vos);
}
+
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 07bd873..37ae3a6 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -149,11 +149,8 @@
}
// 鍏宠仈缁勬墭
} else {
- List<OrderDetl> pg_no = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("pg_no", param.getOrderNo()));
- if (pg_no == null || pg_no.isEmpty()) {
- throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
- }
- Order order = orderService.selectByNo(pg_no.get(0).getOrderNo());
+
+ Order order = orderService.selectOne(new EntityWrapper<Order>().eq("temp1", param.getOrderNo()));
if (Cools.isEmpty(order) || order.getSettle() > 2) {
throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index ce2a799..53b9cea 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -74,6 +74,7 @@
// 鍑哄簱璁㈠崟閲嶆柊鏁寸悊鏄庣粏
DocType docType = docTypeService.selectById(order.getDocType());
if (null != docType && docType.getPakout() == 1) {
+
if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index 9631276..b31a9fc 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -44,7 +44,6 @@
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
try {
- System.out.println("-----------------------------------------------------");
System.out.println(DateUtils.convert(new Date()));
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
// 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
@@ -58,7 +57,6 @@
}
}
}
- System.out.println(DateUtils.convert(new Date()));
// 鍏ュ簱 --------------------------------------------------------------------------------
if (wrkMast.getWrkSts() == 5) {
// 鍏ㄦ澘鍏ュ簱
@@ -97,7 +95,6 @@
// }
// }
}
- System.out.println(DateUtils.convert(new Date()));
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
@@ -114,7 +111,6 @@
if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
// exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
- System.out.println(DateUtils.convert(new Date()));
} catch (Exception e) {
log.error("fail", e);
e.printStackTrace();
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 04b91f3..3798a5f 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -53,6 +53,9 @@
@Autowired
private StaDescService staDescService;
+ @Autowired
+ private OrderService orderService;
+
@PostMapping("/pakin/loc/v1")
@ResponseBody
@@ -354,6 +357,11 @@
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
+ if (!Cools.isEmpty(waitPakin.getOrderNo())) {
+ Order order = orderService.selectByNo(waitPakin.getOrderNo());
+ wrkDetl.setSPgNO(order.getTemp2());
+
+ }
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
diff --git a/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java b/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
index 139c9b7..996a7ec 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
@@ -50,7 +50,7 @@
hedAndDet.put("det", inDetTBS);
boolean result = inMS.createInOrder(inHed, inDetTBS);
if (result) {
- log.info("鍏ュ簱鍗曟嵁鎴愬姛,{}", inHed.getBillNo());
+ log.info("鍏ュ簱鍗曟嵁鎴愬姛,{}", inHed);
move(hedAndDet);
} else {
String sql = "UPDATE erp_InHedTB SET Temp3 = 鈥榝ault鈥� WHERE BillNo = '" + inHed.getBillNo() + "'";
diff --git a/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java b/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
index e803553..c52cf5f 100644
--- a/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
@@ -50,7 +50,7 @@
hedAndDet.put("det", inDetTBS);
boolean result = inMS.createOutOrder(inHed, inDetTBS);
if (result) {
- log.info("鍑哄簱鍗曟嵁鎴愬姛,{}", inHed.getBillNo());
+ log.info("鍑哄簱鍗曟嵁鎴愬姛,{}", inHed);
move(hedAndDet);
} else {
String sql = "UPDATE erp_OutHedTB SET Temp3 = 鈥榝ault鈥� WHERE BillNo = '" + inHed.getBillNo() + "'";
--
Gitblit v1.9.1