From 85fbeb9e06932acd931695c66f26f68af7cfbf86 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 06 十一月 2025 19:22:48 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 1 +
src/main/java/com/zy/asrs/entity/param/StockOutParam.java | 1 +
src/main/webapp/static/js/order/order.js | 1 +
src/main/java/com/zy/common/model/LocDto.java | 2 ++
src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java | 1 +
5 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
index fe581d2..5143458 100644
--- a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
@@ -58,6 +58,7 @@
private Double volume;
private Double price;
private String color;
+ private Integer danger;
public void setAnfme(Double anfme){
this.anfme=anfme;
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 57e9652..f6745c7 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -266,6 +266,7 @@
orderDetl.setSpecs(locDetl.getSpecs());//瑙勬牸
orderDetl.setBrand(locDetl.getBrand());//鏈ㄧ绫诲瀷
orderDetl.setBarcode(locDetl.getZpallet());//鏈ㄧ绫诲瀷
+ orderDetl.setDanger(locDetl.getDanger());//鏈ㄧ绫诲瀷
orderDetl.setWeight(locDetl.getWeight());
// orderDetl.setWorkQty(locDetl.getAnfme());
orderDetl.setWorkQty(0.0);
diff --git a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
index 4e88227..0e862cd 100644
--- a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
@@ -222,6 +222,7 @@
locDetl.setOrigin(locDto.getOrigin());
locDetl.setWeight(locDto.getWeight());
locDetl.setMemo(locDto.getMemo());
+ locDetl.setDanger(locDto.getDanger());
locDetls.add(locDetl);
}
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index e10d679..47a5cf2 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -48,6 +48,7 @@
private Integer staNo;
private Integer tkType;
+ private Integer danger;
public LocDto() {
}
@@ -124,6 +125,7 @@
this.price = locDetl.getPrice();
this.origin = locDetl.getOrigin();
this.memo = locDetl.getMemo();
+ this.danger = locDetl.getDanger();
}
public String getTitle() {
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 61318f4..f2454ee 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -264,6 +264,7 @@
// {field: 'inQty', title: '宸插叆搴撻噺'},
// {field: 'color', title: '棰滆壊'},
{field: 'specs', title: '鎺ュご'},
+ {field: 'danger$', title: '寰呭垽'},
{field: 'qty$', title: '鐘舵��', style: 'font-weight: bold'},
{field: 'source$', title: '鏄惁纭', style: 'font-weight: bold'}
]],
--
Gitblit v1.9.1