From 0f4540b504204b36f854c41cc2e89bb34af60211 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 14 四月 2025 15:39:39 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/locDetl/locDetl.js | 4 +-
src/main/webapp/static/js/manLocDetl/manLocDetl.js | 2
src/main/webapp/static/js/saas/locDetl.js | 2
src/main/java/com/zy/asrs/controller/MobileController.java | 80 ----------------------------------------
src/main/webapp/static/js/common.js | 4 +-
5 files changed, 6 insertions(+), 86 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index ed791d8..2ac0161 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -38,10 +38,6 @@
@Autowired
private LocDetlService locDetlService;
@Autowired
- private OrderService orderService;
- @Autowired
- private OrderDetlService orderDetlService;
- @Autowired
private DocTypeService docTypeService;
@Autowired
private WrkMastService wrkMastService;
@@ -137,82 +133,6 @@
return R.ok("涓嬫灦鎴愬姛");
}
-
-
- // 缁勬墭 ----------------------------------------------------------------------------------------------------
-
- /**
- * 鏍规嵁鍗曞彿妫�绱㈠崟鎹暟鎹�
- * http://localhost:8081/jkwms/mobile/order/serach/orderNo/auth?orderNo=123123
- */
-// @RequestMapping("/order/search/orderNo/auth")
-// @ManagerAuth
-// public R orderSearchByBarcode(@RequestParam String orderNo){
-// Order order = orderService.selectByNo(orderNo);
-// if (order == null) {
-// return R.ok();
-// }
-// DocType docType = docTypeService.selectById(order.getDocType());
-// if (docType.getPakin() == null || docType.getPakin() != 1) {
-// return R.ok();
-// }
-// if (order.getSettle() > 2) {
-// return R.ok();
-// }
-// List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
-// if (Cools.isEmpty(orderDetls)) {
-// return R.ok();
-// }
-// return R.ok().add(orderDetls);
-// }
-
-
-// @RequestMapping("/order/search/orderNo/auth")
-// @ManagerAuth
-// public R orderSearchByBarcode(@RequestParam String orderNo){
-// if (Cools.isEmpty(orderNo)){
-// orderNo=null;
-// }
-//// List<Order> orders = orderService.selectorderNoL(orderNo);
-// List<Order> orders = OrderInAndOutUtil.selectOrderNoL(null, orderNo);
-// if (Cools.isEmpty(orders)){
-// return R.ok();
-// }
-// LinkedList<CombParam> combParams = new LinkedList<>();
-// if (!Cools.isEmpty(orders)){
-// for (Order order:orders){
-// CombParam combParam=new CombParam();
-// if (order == null) {
-// continue;
-// }
-// DocType docType = docTypeService.selectById(order.getDocType());
-// if (docType.getPakin() == null || docType.getPakin() != 1) {
-// continue;
-// }
-// if (order.getSettle() > 2) {
-// continue;
-// }
-//// List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
-// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectWorkingDetls(order.getPakinPakoutStatus$(), order.getId());
-// if (!Cools.isEmpty(orderDetls)) {
-// LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
-// for (OrderDetl orderDetl:orderDetls){
-// CombParam.CombMat combMat = new CombParam.CombMat();
-// combMat.setMatnr(orderDetl.getMatnr());
-// combMat.setBatch(orderDetl.getBatch());
-// combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty());
-// combMat.setMaktx(orderDetl.getMaktx());
-// combMat.setSpecs(orderDetl.getSpecs());
-// combMats.add(combMat);
-// }
-// combParam.setCombMats(combMats);
-// }
-// combParam.setOrderNo(order.getOrderNo());
-// combParams.add(combParam);
-// }
-// }
-// return R.ok().add(combParams);
-// }
@RequestMapping("/order/search/orderNo/auth")
@ManagerAuth
public R orderSearchByBarcode(@RequestParam String orderNo){
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index c120fa8..825eea5 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -196,7 +196,7 @@
,{field: 'sku', align: 'center',title: '宸ュ簭', hide: false}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
+ ,{field: 'origin', align: 'center',title: '鍦ㄥ簱鏍囪', hide: false}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
@@ -238,7 +238,7 @@
,{field: 'sku', align: 'center',title: '宸ュ簭', hide: false}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
+ ,{field: 'origin', align: 'center',title: '鍦ㄥ簱鏍囪', hide: false}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 0446dcf..a6525e7 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -19,7 +19,7 @@
,{field: 'sku', align: 'center',title: '宸ュ簭', hide: false}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
+ ,{field: 'origin', align: 'center',title: '鍦ㄥ簱鏍囪', hide: false}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
@@ -36,7 +36,7 @@
,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
- ,{field: 'frozen$', align: 'center',title: '鍐荤粨鍚�',
+ ,{field: 'frozen$', align: 'center',title: '鍐荤粨鍚�', hide: true,
templet: function(d) {
// 鏍规嵁鏉′欢鍒ゆ柇瀛椾綋棰滆壊
if (d.frozen$ === '宸插喕缁�') {
diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
index d565195..eee69ea 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
@@ -17,7 +17,7 @@
,{field: 'sku', align: 'center',title: '宸ュ簭', hide: false}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
+ ,{field: 'origin', align: 'center',title: '鍦ㄥ簱鏍囪', hide: false}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
diff --git a/src/main/webapp/static/js/saas/locDetl.js b/src/main/webapp/static/js/saas/locDetl.js
index b5e1b73..c08f23e 100644
--- a/src/main/webapp/static/js/saas/locDetl.js
+++ b/src/main/webapp/static/js/saas/locDetl.js
@@ -17,7 +17,7 @@
,{field: 'sku', align: 'center',title: '宸ュ簭', hide: false}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
+ ,{field: 'origin', align: 'center',title: '鍦ㄥ簱鏍囪', hide: false}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
--
Gitblit v1.9.1