From bf411aee332eba93ce827ced5b3aa4c8250d81cc Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 29 十一月 2024 09:22:34 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/pakStore/locCheckOut.js | 2
/dev/null | 18 ------
src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java | 38 ++++++++++++
src/main/java/com/zy/asrs/entity/param/StockCheckParam.java | 36 ++++++++++++
src/main/java/com/zy/asrs/controller/LocDetlController.java | 38 +-----------
src/main/webapp/static/js/order/order.js | 12 ++--
src/main/webapp/views/pakStore/locDetlQuery.html | 2
src/main/java/com/zy/common/model/DetlDto.java | 1
src/main/java/com/zy/asrs/controller/MobileController.java | 10 +++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 2
src/main/webapp/views/order/order.html | 5 +
11 files changed, 103 insertions(+), 61 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
index f60d972..63d1b96 100644
--- a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
+++ b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
@@ -10,7 +10,13 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.InventoryCheckOrder;
+import com.zy.asrs.entity.InventoryCheckOrderDetl;
+import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.InventoryCheckOrderDetlService;
import com.zy.asrs.service.InventoryCheckOrderService;
+import com.zy.asrs.service.WrkDetlService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -22,6 +28,38 @@
@Autowired
private InventoryCheckOrderService inventoryCheckOrderService;
+ @Autowired
+ private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+
+ @RequestMapping("/inventoryCheckOrder/StockCheck/select/barcode")
+ @ManagerAuth()
+ public R StockCheckSelectBarcode(@RequestParam String barcode) {
+ if (Cools.isEmpty(barcode)) {
+ return R.ok();
+ }
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode));
+ if (Cools.isEmpty(wrkMast)) {
+ return R.error("璇ユ潯鐮佹湭鏌ヨ鍒扮洏鐐逛换鍔�");
+ }
+ ArrayList<InventoryCheckOrderDetl> checkOrderDetls = new ArrayList<>();
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ for (WrkDetl wrkDetl : wrkDetls) {
+ InventoryCheckOrderDetl checkDetl = inventoryCheckOrderDetlService.selectOne(new EntityWrapper<InventoryCheckOrderDetl>()
+ .eq("order_no", wrkMast.getSheetNo())
+ .eq("matnr", wrkDetl.getMatnr())
+ .eq("batch", wrkDetl.getBatch()));
+ if (Cools.isEmpty(checkDetl)) {
+ continue;
+ }
+ checkOrderDetls.add(checkDetl);
+
+ }
+ return R.ok(checkOrderDetls);
+ }
@RequestMapping("/inventoryCheckOrder/select/status/1")
@ManagerAuth()
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 5cb0385..58f2e66 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -82,41 +82,11 @@
param.remove("modi_time");
}
}
- param.remove("curr");
- param.remove("limit");
- EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
- if (!Cools.isEmpty(param.get("crnNo"))) {
- switch ((String) param.get("crnNo")) {
- case "1": wrapper.le("SUBSTRING(loc_no, 1, 2)",4);
- break;
- case "2":wrapper.ge("SUBSTRING(loc_no, 1, 2)",5).le("SUBSTRING(loc_no, 1, 2)",8);
- break;
- case "3":wrapper.ge("SUBSTRING(loc_no, 1, 2)",9).le("SUBSTRING(loc_no, 1, 2)",12);
- break;
- case "4":wrapper.ge("SUBSTRING(loc_no, 1, 2)",13).le("SUBSTRING(loc_no, 1, 2)",16);
- break;
- case "5":
- break;
- case "6":
- break;
- case "7":wrapper.ge("SUBSTRING(loc_no, 1, 2)",17).le("SUBSTRING(loc_no, 1, 2)",37);
- break;
- case "8":wrapper.ge("SUBSTRING(loc_no, 1, 2)",38).le("SUBSTRING(loc_no, 1, 2)",45);
- break;
- case "9":wrapper.ge("SUBSTRING(loc_no, 1, 2)",46).le("SUBSTRING(loc_no, 1, 2)",53);
- break;
- default:
- }
- param.remove("crnNo");
+ Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
+ if (stockOut.getRecords().size()==0){
+ stockOut = locDetlService.getStockOut(toPage(1, limit, param, LocDetl.class));
}
- convert(param, wrapper);
- // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- RoleUtils.addRoleWrapperByLocNo(getUserId(),wrapper);
- Page<LocDetl> locDetlPage = locDetlService.selectPage(new Page<>(curr, limit), wrapper);
- if (locDetlPage.getRecords().size()==0){
- locDetlPage = locDetlService.selectPage(new Page<>(1, limit), wrapper);
- }
- return R.ok(locDetlPage);
+ return R.ok(stockOut);
}
@RequestMapping(value = "/stock/out/crn/list/auth")
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 61aea20..a387938 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -62,6 +62,16 @@
@Autowired
private CommonService commonService;
+
+// @PostMapping("/agv/start")
+// @ManagerAuth
+// public R pdaStockCheck(@RequestBody StockCheckParam param){
+//
+//
+//
+// }
+
+
@PostMapping("/agv/start")
@ManagerAuth
public R pdaAgvStart(@RequestBody Map<String,Object> map){
diff --git a/src/main/java/com/zy/asrs/entity/param/StockCheckParam.java b/src/main/java/com/zy/asrs/entity/param/StockCheckParam.java
new file mode 100644
index 0000000..f7f21b2
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/StockCheckParam.java
@@ -0,0 +1,36 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class StockCheckParam {
+
+ // 鎵樼洏鏉＄爜
+ private String barcode;
+
+ private List<CombMat> combMats;
+
+ @Data
+ public static class CombMat {
+
+ // 鐗╂枡缂栧彿
+ private String matnr;
+
+ // 搴忓垪鐮�
+ private String batch;
+
+ // 鐗╂枡鏁伴噺
+ private Double anfme;
+
+ // 鍟嗗搧鍚嶇О
+ private String maktx;
+
+ // 瑙勬牸
+ private String specs;
+
+ private Double checkAnfme;
+
+ }
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 2403716..d0b0e65 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -144,6 +144,7 @@
orderDetl.setSuppCode(detlDto.getFromOrderNo());
orderDetl.setMemo(detlDto.getMemo());
orderDetl.setManu(detlDto.getMark());
+ orderDetl.setSupp(detlDto.getCustomer());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -283,6 +284,7 @@
orderDetl.setSuppCode(detlDto.getFromOrderNo());
orderDetl.setMemo(detlDto.getMemo());
orderDetl.setManu(detlDto.getMark());
+ orderDetl.setSupp(detlDto.getCustomer());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 051b6c6..99c2dbb 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -21,6 +21,7 @@
private String fromOrderNo; //鏉ユ簮鍗曞彿
private String memo; //澶囨敞
private String mark;
+ private String customer;
public DetlDto() {
}
diff --git a/src/main/java/inventoryCheckOrder.sql b/src/main/java/inventoryCheckOrder.sql
deleted file mode 100644
index cb33b31..0000000
--- a/src/main/java/inventoryCheckOrder.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save inventoryCheckOrder record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'inventoryCheckOrder/inventoryCheckOrder.html', 'inventoryCheckOrder绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'inventoryCheckOrder#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'inventoryCheckOrder#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'inventoryCheckOrder#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'inventoryCheckOrder#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'inventoryCheckOrder#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'inventoryCheckOrder/inventoryCheckOrder.html', N'inventoryCheckOrder绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'inventoryCheckOrder#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'inventoryCheckOrder#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'inventoryCheckOrder#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'inventoryCheckOrder#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'inventoryCheckOrder#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/inventoryCheckOrderDetl.sql b/src/main/java/inventoryCheckOrderDetl.sql
deleted file mode 100644
index b12457a..0000000
--- a/src/main/java/inventoryCheckOrderDetl.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save inventoryCheckOrderDetl record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'inventoryCheckOrderDetl/inventoryCheckOrderDetl.html', 'inventoryCheckOrderDetl绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'inventoryCheckOrderDetl#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'inventoryCheckOrderDetl#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'inventoryCheckOrderDetl#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'inventoryCheckOrderDetl#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'inventoryCheckOrderDetl#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'inventoryCheckOrderDetl/inventoryCheckOrderDetl.html', N'inventoryCheckOrderDetl绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'inventoryCheckOrderDetl#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'inventoryCheckOrderDetl#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'inventoryCheckOrderDetl#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'inventoryCheckOrderDetl#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'inventoryCheckOrderDetl#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 7a4fab3..83bb5a2 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -42,15 +42,15 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
- {field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
- {align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
- {field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
+ {field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl',minWidth: 200},
+ {field: 'docType$', align: 'center', title: '绫诲瀷'},
+ {align: 'center', title: '鏄庣粏', toolbar: '#tbLook'},
+ {field: 'createTime$', title: '鍒涘缓鏃堕棿'},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
{field: 'shipName', align: 'center',title: '鍒跺崟浜�'},
{field: 'itemName', align: 'center',title: '浠撳簱'},
{field: 'memo', align: 'center',title: '澶囨敞', hide: true},
- {align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
+ {align: 'center', title: '鎿嶄綔', toolbar: '#operate'}
]],
request: {
pageName: 'curr',
@@ -181,7 +181,7 @@
var templateDom = $("#templatePreview1");
var className = templateDom.attr("class");
var param = "缂栫爜:"+data.matnr+";鍚嶇О:"+data.maktx+";鎵规:"+data.batch+";瑙勬牸:"+data.specs
- +";鍗曚綅:"+data.unit+";鏁伴噺:"+data.anfme+";瀹㈡埛鍚嶇О:"+data.cstmrName;
+ +";鍗曚綅:"+data.unit+";鏁伴噺:"+data.anfme+";閿�鍞崟鍙�:"+data.suppCode+";瀹㈡埛鍚嶇О:"+data.supp;
var encodeUrl = encodeURIComponent(param);
data["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2¶m="+encodeUrl;
console.log(data["barcodeUrl"]);
diff --git a/src/main/webapp/static/js/pakStore/locCheckOut.js b/src/main/webapp/static/js/pakStore/locCheckOut.js
index d2e5b58..8bbcf0d 100644
--- a/src/main/webapp/static/js/pakStore/locCheckOut.js
+++ b/src/main/webapp/static/js/pakStore/locCheckOut.js
@@ -3,7 +3,7 @@
var locDetlData = [];
function getCol() {
var cols = [
- {field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
+ {field: 'locNo', align: 'center',title: '搴撲綅鍙�', style: 'font-weight: bold'}
];
cols.push.apply(cols, detlCols);
return cols;
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index dda5489..dffd0cd 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -211,7 +211,10 @@
鏁伴噺锛歿{anfme}}
</div>
<div style="font-size: 12px;">
- 瀹㈡埛鍚嶇О锛歿{cstmrName}}
+ 閿�鍞崟鍙凤細{{suppCode}}
+ </div>
+ <div style="font-size: 12px;">
+ 瀹㈡埛鍚嶇О锛歿{supp}}
</div>
</div>
{{/each}}
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 68f73d3..f08e299 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -111,7 +111,7 @@
function getCol() {
var cols = [
- {type: 'checkbox', merge: ['locNo']}
+ {type: 'checkbox'}
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
// ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
];
--
Gitblit v1.9.1