From 2c83b33304129e926c2b6d3421307f628b761ad0 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 03 十二月 2025 14:19:18 +0800
Subject: [PATCH] #出库单
---
src/main/java/com/zy/asrs/controller/OrderPakoutController.java | 2
src/main/java/com/zy/asrs/entity/OrderDetlPakout.java | 8 +++
src/main/webapp/static/js/orderPakout/order.js | 42 +++++++++++++++++---
src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java | 2 +
src/main/java/com/zy/asrs/entity/OrderPakout.java | 21 ++++++++++
src/main/webapp/views/orderPakout/order.html | 8 ++++
6 files changed, 73 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
index 23fbfff..d79066f 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
@@ -117,7 +117,7 @@
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
param.getDocType(), // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
- null, //
+ param.getItemName(), // 鍖哄煙ID
null, // 璋冩嫧椤圭洰缂栧彿
null, // 鍒濆绁ㄦ嵁鍙�
null, // 绁ㄦ嵁鍙�
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
index 3af2a93..273c4df 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
@@ -90,7 +90,7 @@
* 鎵瑰彿
*/
@ApiModelProperty(value= "鎵瑰彿")
- private String batch;
+ private String batch = "1";
/**
* 瑙勬牸
@@ -396,6 +396,12 @@
this.memo = memo;
}
+ //灏忔澗椤圭洰鏃犳壒娆★紝榛樿1鏂逛究鍚庣画淇敼
+ public void setBatch(String batch) {
+ this.batch = batch == null ? "1" : batch;
+ }
+
+
public String getOrderId$(){
OrderService service = SpringUtils.getBean(OrderService.class);
Order order = service.selectById(this.orderId);
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakout.java b/src/main/java/com/zy/asrs/entity/OrderPakout.java
index aaa08a9..bab33e7 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakout.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.entity.BasAreas;
+import com.zy.asrs.service.BasAreasService;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderSettleService;
import com.zy.common.utils.Synchro;
@@ -66,7 +68,7 @@
@TableField("item_id")
private Long itemId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鍖哄煙ID")
@TableField("item_name")
private String itemName;
@@ -352,6 +354,23 @@
// null // 澶囨敞
// );
+
+ public String getItemName$() {
+ if (Cools.isEmpty(this.itemName)) {
+ return null;
+ }
+ try {
+ BasAreasService service = SpringUtils.getBean(BasAreasService.class);
+ BasAreas area = service.selectById(Long.parseLong(this.itemName));
+ if (!Cools.isEmpty(area)) {
+ return area.getName();
+ }
+ } catch (Exception e) {
+ return this.itemName;
+ }
+ return null;
+ }
+
public String getDocType$(){
DocTypeService service = SpringUtils.getBean(DocTypeService.class);
DocType docType = service.selectById(this.docType);
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 8721ace..2f7b6a8 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java
@@ -17,6 +17,8 @@
private String orderNo;
+ private String itemName;
+
private List<OrderDetl> orderDetlList;
private List<OrderDetlPakin> orderDetlPakinList;
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index bedb1f0..3f6dc40 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -43,12 +43,13 @@
cols: [[
{type: 'numbers'},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
+ {field: 'itemName$', align: 'center', title: '鍑哄簱鍖哄煙', minWidth: 160, width: 160},
{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: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
{field: 'memo', align: 'center',title: '澶囨敞', hide: true},
- {align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
+ {align: 'center', title: '鎿嶄綔', toolbar: '#operate'}
]],
request: {
pageName: 'curr',
@@ -122,9 +123,10 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
- {field: 'batch', title: '鎵瑰彿'},
+ {field: 'matnr', title: '闆朵欢浠ｇ爜', width: 160},
+ {field: 'maktx', title: '闆朵欢鍚嶇О', width: 160},
+ // {field: 'batch', title: '鎵瑰彿'},
+ {field: 'standby1', title: '渚涘簲鍟嗕唬鐮�'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
@@ -173,6 +175,30 @@
success: function (layero, dIndex) {
$(layero).children('.layui-layer-content').css('overflow', 'visible');
var isExpAdd = !expTpe;
+ // 鍔犺浇鍖哄煙涓嬫媺鏁版嵁
+ $.ajax({
+ url: baseUrl + "/basAreas/list/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: { limit: 9999 },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ var areaSelect = $(layero).find('select[name="itemName"]');
+ var html = '<option value="">璇烽�夋嫨鍖哄煙</option>';
+ var records = res.data.records || res.data;
+ for (var i = 0; i < records.length; i++) {
+ var selected = (expTpe && expTpe.itemName == records[i].id) ? ' selected' : '';
+ html += '<option value="' + records[i].id + '"' + selected + '>' + records[i].name + '</option>';
+ }
+ areaSelect.html(html);
+ form.render('select', 'editForm');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ });
// 鍥炴樉鏁版嵁
form.val('editForm', expTpe);
if (expTpe) {
@@ -204,6 +230,7 @@
orderId: Number(data.field.id),
docType: Number(data.field.docType),
orderNo: data.field.orderNo,
+ areaId: data.field.areaId ? Number(data.field.areaId) : null,
orderDetlPakoutList: nList
}),
contentType:'application/json;charset=UTF-8',
@@ -234,9 +261,10 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers', title: '#'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
- {field: 'batch', title: '鎵瑰彿', edit: true},
+ {field: 'matnr', title: '闆朵欢浠ｇ爜', width: 160},
+ {field: 'maktx', title: '闆朵欢鍚嶇О', width: 200},
+ // {field: 'batch', title: '鎵瑰彿', edit: true},
+ {field: 'standby1', title: '渚涘簲鍟嗕唬鐮�', edit: true},
{field: 'specs', title: '瑙勬牸'},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
diff --git a/src/main/webapp/views/orderPakout/order.html b/src/main/webapp/views/orderPakout/order.html
index 7584f2e..f87b9bc 100644
--- a/src/main/webapp/views/orderPakout/order.html
+++ b/src/main/webapp/views/orderPakout/order.html
@@ -163,6 +163,14 @@
<!-- lay-verify="required"-->
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍑哄簱鍖哄煙锛�</label>
+ <div class="layui-input-block">
+ <select id="itemName" name="itemName" lay-verType="tips">
+ <option value="">璇烽�夋嫨鍖哄煙</option>
+ </select>
+ </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