From d1be26f8d8196716257de0d3b09daa83a62bfffe Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 04 十一月 2025 13:43:51 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 6 --
src/main/java/com/zy/asrs/controller/OrderController.java | 18 +++++-
src/main/java/com/zy/asrs/controller/OrderPakinController.java | 19 +++++-
src/main/java/com/zy/asrs/entity/LocOwner.java | 4
src/main/java/com/zy/asrs/entity/Order.java | 2
src/main/java/com/zy/asrs/controller/LocOwnerController.java | 5 +
src/main/webapp/views/order/order.html | 19 ++++++
src/main/java/com/zy/asrs/controller/OrderPakoutController.java | 19 +++++-
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 6 --
src/main/java/com/zy/asrs/entity/WaitPakin.java | 6 --
src/main/webapp/static/js/orderPakout/order.js | 2
src/main/java/com/zy/asrs/entity/LocDetl.java | 3 -
src/main/resources/mapper/LocOwnerMapper.xml | 2
src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java | 2
src/main/java/com/zy/asrs/entity/WrkDetl.java | 6 --
src/main/webapp/static/js/order/order.js | 5 +
src/main/webapp/static/js/orderPakin/order.js | 2
17 files changed, 83 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocOwnerController.java b/src/main/java/com/zy/asrs/controller/LocOwnerController.java
index 9f9f0b2..e9f0e1c 100644
--- a/src/main/java/com/zy/asrs/controller/LocOwnerController.java
+++ b/src/main/java/com/zy/asrs/controller/LocOwnerController.java
@@ -114,13 +114,14 @@
@ManagerAuth
public R query(String condition) {
EntityWrapper<LocOwner> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
+ wrapper.like("owner", condition);
+ wrapper.eq("status", 1);
Page<LocOwner> page = locOwnerService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (LocOwner locOwner : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", locOwner.getId());
- map.put("value", locOwner.getId());
+ map.put("value", locOwner.getOwner());
result.add(map);
}
return R.ok(result);
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 4fcd85b..539ee9e 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -42,6 +42,8 @@
private WrkMastService wrkMastService;
@Autowired
private WrkMastLogService wrkMastLogService;
+ @Autowired
+ private LocOwnerService locOwnerService;
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
@@ -113,6 +115,12 @@
status = (docType.getPakin() == 1 ? 1 : 2 );
}
}
+ LocOwner locOwner = null;
+ if (!Cools.isEmpty(param.getOwnerId())) {
+ locOwner = locOwnerService.selectById(param.getOwnerId());
+ } else {
+ locOwner = locOwnerService.selectById(1);
+ }
Order order = orderService.selectByNo(param.getOrderNo());
if (order != null) {
@@ -125,12 +133,12 @@
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
param.getDocType(), // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
- null, //
+ param.getStandby1(), //椤圭洰鍚嶇О 瀹㈡埛PO鍙�
null, // 璋冩嫧椤圭洰缂栧彿
null, // 鍒濆绁ㄦ嵁鍙�
null, // 绁ㄦ嵁鍙�
- null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
+ locOwner.getOwnerUuid(), // 瀹㈡埛缂栧彿
+ locOwner.getOwner(), // 瀹㈡埛
null, // 鑱旂郴鏂瑰紡
null, // 鎿嶄綔浜哄憳
null, // 鍚堣閲戦
@@ -181,6 +189,10 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
+ orderDetl.setStandby1(param.getStandby1().toString());//po
+ orderDetl.setBoxType1(locOwner.getId().toString());//璐т富ID
+ orderDetl.setBoxType2(locOwner.getOwnerUuid().toString());//璐т富UUID
+ orderDetl.setBoxType3(locOwner.getOwner());//璐т富
orderDetl.setPakinPakoutStatus(status);
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakinController.java b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
index fb81d0f..08f5297 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
@@ -42,6 +42,8 @@
private WrkMastService wrkMastService;
@Autowired
private WrkMastLogService wrkMastLogService;
+ @Autowired
+ private LocOwnerService locOwnerService;
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
@@ -110,6 +112,12 @@
if (order != null) {
return R.error("鍗曟嵁缂栧彿宸插瓨鍦�");
}
+ LocOwner locOwner = null;
+ if (!Cools.isEmpty(param.getOwnerId())) {
+ locOwner = locOwnerService.selectById(param.getOwnerId());
+ } else {
+ locOwner = locOwnerService.selectById(1);
+ }
Date now = new Date();
order = new OrderPakin(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
@@ -117,12 +125,12 @@
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
param.getDocType(), // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
- null, //
+ param.getStandby1(), //
null, // 璋冩嫧椤圭洰缂栧彿
null, // 鍒濆绁ㄦ嵁鍙�
null, // 绁ㄦ嵁鍙�
- null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
+ locOwner.getOwnerUuid(), // 瀹㈡埛缂栧彿
+ locOwner.getOwner(), // 瀹㈡埛
null, // 鑱旂郴鏂瑰紡
null, // 鎿嶄綔浜哄憳
null, // 鍚堣閲戦
@@ -174,6 +182,11 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
+ orderDetl.setStandby1(param.getStandby1().toString());//po
+ orderDetl.setBoxType1(locOwner.getId().toString());//璐т富ID
+ orderDetl.setBoxType2(locOwner.getOwnerUuid().toString());//璐т富UUID
+ orderDetl.setBoxType3(locOwner.getOwner());//璐т富
+ orderDetl.setPakinPakoutStatus(1);
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
index 23fbfff..9672c55 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
@@ -42,6 +42,8 @@
private WrkMastService wrkMastService;
@Autowired
private WrkMastLogService wrkMastLogService;
+ @Autowired
+ private LocOwnerService locOwnerService;
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
@@ -110,6 +112,12 @@
if (order != null) {
return R.error("鍗曟嵁缂栧彿宸插瓨鍦�");
}
+ LocOwner locOwner = null;
+ if (!Cools.isEmpty(param.getOwnerId())) {
+ locOwner = locOwnerService.selectById(param.getOwnerId());
+ } else {
+ locOwner = locOwnerService.selectById(1);
+ }
Date now = new Date();
order = new OrderPakout(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
@@ -117,12 +125,12 @@
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
param.getDocType(), // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
- null, //
+ param.getStandby1(), //
null, // 璋冩嫧椤圭洰缂栧彿
null, // 鍒濆绁ㄦ嵁鍙�
null, // 绁ㄦ嵁鍙�
- null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
+ locOwner.getOwnerUuid(), // 瀹㈡埛缂栧彿
+ locOwner.getOwner(), // 瀹㈡埛
null, // 鑱旂郴鏂瑰紡
null, // 鎿嶄綔浜哄憳
null, // 鍚堣閲戦
@@ -172,6 +180,11 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
+ orderDetl.setStandby1(param.getStandby1().toString());//po
+ orderDetl.setBoxType1(locOwner.getId().toString());//璐т富ID
+ orderDetl.setBoxType2(locOwner.getOwnerUuid().toString());//璐т富UUID
+ orderDetl.setBoxType3(locOwner.getOwner());//璐т富
+ orderDetl.setPakinPakoutStatus(2);
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index bd0bf0d..129453c 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -168,9 +168,6 @@
@ApiModelProperty(value= "鎷ユ湁鑰� 1: 鏉板厠 ")
private Integer owner;
- @ApiModelProperty(value= "瀹㈡埛缂栧彿")
- private Long uuid;
-
/**
* 澶囩敤1
*/
diff --git a/src/main/java/com/zy/asrs/entity/LocOwner.java b/src/main/java/com/zy/asrs/entity/LocOwner.java
index 3df4780..744c156 100644
--- a/src/main/java/com/zy/asrs/entity/LocOwner.java
+++ b/src/main/java/com/zy/asrs/entity/LocOwner.java
@@ -23,7 +23,8 @@
private String owner;
@ApiModelProperty(value= "瀹㈡埛缂栧彿")
- private Long uuid;
+ @TableField("owner_uuid")
+ private Long ownerUuid;
@ApiModelProperty(value= "鐘舵��")
private Integer status;
@@ -33,5 +34,4 @@
private Integer ownerType;
public LocOwner() {}
-
}
diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index 90aac1d..284afce 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -66,7 +66,7 @@
@TableField("item_id")
private Long itemId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "Po")
@TableField("item_name")
private String itemName;
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 66685fe..e1bfb4c 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -195,12 +195,6 @@
@TableField("box_type3")
private String boxType3 = "1";
- @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
- private String owner;
-
- @ApiModelProperty(value= "瀹㈡埛缂栧彿")
- private Long uuid;
-
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
switch (this.beBatch){
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index 6fb3086..d8c7306 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -194,12 +194,6 @@
@TableField("box_type3")
private String boxType3 = "1";
- @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
- private String owner;
-
- @ApiModelProperty(value= "瀹㈡埛缂栧彿")
- private Long uuid;
-
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
switch (this.beBatch){
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index f187335..9563fff 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -309,12 +309,6 @@
@TableField("box_type3")
private String boxType3 = "1";
- @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
- private String owner;
-
- @ApiModelProperty(value= "瀹㈡埛缂栧彿")
- private Long uuid;
-
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 0601352..6fa1590 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -309,12 +309,6 @@
@TableField("box_type3")
private String boxType3 = "1";
- @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
- private String owner;
-
- @ApiModelProperty(value= "瀹㈡埛缂栧彿")
- private Long uuid;
-
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java b/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java
index 352cfe3..04d3445 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java
@@ -18,6 +18,8 @@
private Long docType;
private String orderNo;
+ private String standby1;
+ private Integer ownerId;
private List<OrderDetl> orderDetlList;
private List<OrderDetlPakin> orderDetlPakinList;
diff --git a/src/main/resources/mapper/LocOwnerMapper.xml b/src/main/resources/mapper/LocOwnerMapper.xml
index 733861f..25cf6ae 100644
--- a/src/main/resources/mapper/LocOwnerMapper.xml
+++ b/src/main/resources/mapper/LocOwnerMapper.xml
@@ -6,7 +6,7 @@
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocOwner">
<id column="id" property="id"/>
<result column="owner" property="owner"/>
- <result column="uuid" property="uuid"/>
+ <result column="owner_uuid" property="ownerUuid" />
<result column="status" property="status"/>
<result column="owner_type" property="ownerType"/>
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 752301b..fc4197d 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -43,8 +43,9 @@
cols: [[
{type: 'numbers'},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
- {field: 'po', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
+ {field: 'itemName', align: 'center', title: '瀹㈡埛po', minWidth: 160, width: 160},
{field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
+ {field: 'cstmrName', align: 'center', title: '璐т富', minWidth: 160, width: 160},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
{field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
@@ -207,6 +208,8 @@
orderId: Number(data.field.id),
docType: Number(data.field.docType),
orderNo: data.field.orderNo,
+ standby1: data.field.standby1,
+ ownerId: Number(data.field.owner),
orderDetlList: nList
}),
contentType:'application/json;charset=UTF-8',
diff --git a/src/main/webapp/static/js/orderPakin/order.js b/src/main/webapp/static/js/orderPakin/order.js
index f4181dc..75329bc 100644
--- a/src/main/webapp/static/js/orderPakin/order.js
+++ b/src/main/webapp/static/js/orderPakin/order.js
@@ -43,7 +43,9 @@
cols: [[
{type: 'numbers'},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
+ {field: 'itemName', align: 'center', title: '瀹㈡埛po', minWidth: 160, width: 160},
{field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
+ {field: 'cstmrName', align: 'center', title: '璐т富', minWidth: 160, width: 160},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
{field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index eb5e758..71f9abf 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -43,7 +43,9 @@
cols: [[
{type: 'numbers'},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
+ {field: 'itemName', align: 'center', title: '瀹㈡埛po', minWidth: 160, width: 160},
{field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
+ {field: 'cstmrName', align: 'center', title: '璐т富', minWidth: 160, width: 160},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
{field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 04ab4c5..df74b30 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -164,6 +164,25 @@
<!-- lay-verify="required"-->
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹㈡埛PO锛�</label>
+ <div class="layui-input-block">
+ <input id="standby1" name="standby1" placeholder="杈撳叆瀹㈡埛PO" type="text" class="layui-input" maxlength="20" lay-verType="tips" />
+ <!-- lay-verify="required"-->
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">璐т富锛�</label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="owner" placeholder="杈撳叆璐т富鍚嶇О" style="display: none">
+ <input id="owner$" name="owner$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヨ揣涓诲悕绉�" onfocus=this.blur() lay-verType="tips" lay-verify="required">
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="locOwnerQueryBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="locOwnerQueryBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
<div class="layui-form-item" style="position: relative;">
<label class="layui-form-label">鍗曟嵁鏄庣粏锛�</label>
<div class="layui-input-block">
--
Gitblit v1.9.1