From 3c992dd950b539f03cdf64898f8bfba65c2313b8 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 08 十一月 2025 15:10:25 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/OrderDetlPakout.java | 6 +
src/main/webapp/views/orderPakout/out.html | 2
src/main/webapp/static/js/orderPakout/order.js | 76 ++++++++++++++
src/main/java/com/zy/asrs/utils/OrderOutBatchUtil.java | 143 +++++++++++++++++-----------
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 7
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 13 +
src/main/webapp/views/orderPakout/order.html | 12 ++
7 files changed, 191 insertions(+), 68 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
index 9d5e3ee..4b3f7e0 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
@@ -435,9 +435,11 @@
if (null == this.status){ return null; }
switch (this.status){
case 1:
- return "姝ｅ父";
+ return "鏈笂鎶�";
case 0:
return "绂佺敤";
+ case 2:
+ return "绛夊緟涓婃姤";
default:
return String.valueOf(this.status);
}
@@ -476,6 +478,8 @@
}
public String getQty$(){
+ if (this.qty == null) return "";
+ if (this.anfme == null) return "鏃犳暟鎹�";
if (this.anfme.equals(this.qty)){
return "宸插畬鎴�";
}
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 8084f72..b16528f 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1205,19 +1205,24 @@
@Transactional
public R cargoBookingNote(OrderCargoBookingNoteParam param) {
try{
- List<String[]> OutLocBoxCs = new ArrayList<>();
+ List<OrderOutLocBoxCsUtilParam> OutLocBoxCs = new ArrayList<>();
String orderNo = "ZH" + snowflakeIdWorker.nextId();
for (OrderCargoBookingNoteParam.Box box : param.getBoxList()){
for (OrderCargoBookingNoteParam.Box.Roll roll : box.getRollList()){
- String[] outLocBox = new String[]{box.getBoxNo(),orderNo,param.getCstmrName(),roll.getMemo(),"鍚堟牸"};
+ OrderOutLocBoxCsUtilParam outLocBox = new OrderOutLocBoxCsUtilParam();
+ outLocBox.setBoxNo(box.getBoxNo());
+ outLocBox.setRoll(roll.getRollNo());
+ outLocBox.setMemo(roll.getMemo());
+ outLocBox.setOrderOneNo(orderNo);
+ outLocBox.setCstmrName(param.getCstmrName());
+ outLocBox.setDanger("鍚堟牸");
OutLocBoxCs.add(outLocBox);
}
}
if (!OutLocBoxCs.isEmpty()){
- OrderOutBatchUtil orderOutBatchUtil = new OrderOutBatchUtil(orderNo,param.getCstmrName(),"","MES涓嬪彂璁″垝缁勮揣鍗�","璁″垝缁勮揣鍗�",true,param.getGroupGoodsNo());
+ OrderOutBatchUtil orderOutBatchUtil = new OrderOutBatchUtil(orderNo,param.getCstmrName(),"","MES涓嬪彂璁″垝缁勮揣鍗�","璁″垝缁勮揣鍗�",false,param.getGroupGoodsNo());
return orderOutBatchUtil.setOrderOutBatchCargoBookingNote(OutLocBoxCs);
-// return R.ok();
}
} catch (Exception e) {
throw new CoolException("缁勮揣鍗曞彿锛�"+param.getGroupGoodsNo()+"璁″垝缁勮揣鍗曟帴鏀跺け璐ワ紒锛侊紒"+e.getMessage());
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 38e591c..7e78d84 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -319,7 +319,7 @@
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
docType.getDocId(), // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
- null, //
+ param.getGroupGoodsNo(), //缁勮揣鍗曞彿
null, // 璋冩嫧椤圭洰缂栧彿
null, // 鍒濆绁ㄦ嵁鍙�
null, // 绁ㄦ嵁鍙�
@@ -341,7 +341,7 @@
null, // 鍙戣揣鏃堕棿
null, // 鐗╂祦鍚嶇О
null, // 鐗╂祦鍗曞彿
- 1L, // 璁㈠崟鐘舵��
+ 9L, // 璁㈠崟鐘舵��
1, // 鐘舵��
userId, // 娣诲姞浜哄憳
now, // 娣诲姞鏃堕棿
@@ -360,7 +360,8 @@
i++;
Mat mat = matService.selectByMatnr(locDetl.getMatnr());
if (Cools.isEmpty(mat)) {
- throw new CoolException(locDetl.getMatnr() + "鐗╂枡缂栫爜妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+// throw new CoolException(locDetl.getMatnr() + "鐗╂枡缂栫爜妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+ mat = new Mat();
}
OrderDetlPakout orderDetl = new OrderDetlPakout();
orderDetl.sync(mat);
diff --git a/src/main/java/com/zy/asrs/utils/OrderOutBatchUtil.java b/src/main/java/com/zy/asrs/utils/OrderOutBatchUtil.java
index fb1cdd0..f30eab3 100644
--- a/src/main/java/com/zy/asrs/utils/OrderOutBatchUtil.java
+++ b/src/main/java/com/zy/asrs/utils/OrderOutBatchUtil.java
@@ -11,6 +11,7 @@
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.MatService;
import com.zy.asrs.service.WorkService;
import com.zy.common.model.LocDto;
import com.zy.common.properties.SlaveProperties;
@@ -78,7 +79,6 @@
public R setOrderOutBatch() {
return R.ok();
}
-
public R setOrderOutBatch(List<OrderOutLocBoxCsUtilParam> OutLocBoxCs) {
int total = OutLocBoxCs.size();
@@ -239,7 +239,8 @@
}
return R.error(requert);
}
- public R setOrderOutBatchCargoBookingNote(List<String[]> OutLocBoxCs) {
+
+ public R setOrderOutBatchCargoBookingNote(List<OrderOutLocBoxCsUtilParam> OutLocBoxCs) {
int total = OutLocBoxCs.size();
if (!Cools.isEmpty(OutLocBoxCs) && !OutLocBoxCs.isEmpty()) {
LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
@@ -247,77 +248,107 @@
SlaveProperties slaveProperties = SpringUtils.getBean(SlaveProperties.class);
WorkService workService = SpringUtils.getBean(WorkService.class);
List<LocDto> locDtos = new ArrayList<>();
- List<String[]> outLocBoxCList = new ArrayList<>();
+ List<OrderOutLocBoxCsUtilParam> outLocBoxCList = new ArrayList<>();
List<String> outLocBoxCNew = new ArrayList<>();
- for (String[] outLocBoxC : OutLocBoxCs) {
+ List<String> outLocRollListOld = new ArrayList<>();
+ List<String> outLocRollListNew = new ArrayList<>();
+ for (OrderOutLocBoxCsUtilParam outLocBoxC : OutLocBoxCs) {
+ if (!outLocRollListOld.contains(outLocBoxC.getRoll())) {
+ outLocRollListOld.add(outLocBoxC.getRoll());
+ }
+ }
+ for (OrderOutLocBoxCsUtilParam outLocBoxC : OutLocBoxCs) {
total--;
- if (!outLocBoxCNew.contains(outLocBoxC[0])) {
- LocDetl locDetlSou = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", outLocBoxC[0]));
- if (Cools.isEmpty(locDetlSou)) {
+ LocDetl locDetlSou = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", outLocBoxC.getBoxNo()).eq("model",outLocBoxC.getRoll()));
+ if (Cools.isEmpty(locDetlSou)) {
+ locDetlSou = new LocDetl();
+ locDetlSou.setBatch(outLocBoxC.getBoxNo());
+ locDetlSou.setModel(outLocBoxC.getRoll());
+ locDetlSou.setLocNo("鏃犲簱瀛�");
+// sign = false;
+ errorMsgOrderLoc = errorMsgOrderLoc + "[===銆�" + "绠卞彿锛�" + outLocBoxC.getBoxNo() + "鍗峰彿锛�" + outLocBoxC.getRoll() + " 鏈煡璇㈠埌鏁版嵁锛侊紒锛併��===]";
+// continue;
+ }
+ if (signDanger){
+ if (!locDetlSou.getDanger$().equals(outLocBoxC.getDanger())) {
sign = false;
- errorMsgOrderLoc = errorMsgOrderLoc + "[===銆�" + "绠卞彿锛�" + outLocBoxC[0] + " 鏈煡璇㈠埌鏁版嵁锛侊紒锛併��===]";
+ errorMsgOrderLoc = errorMsgOrderLoc + "[===銆�" + "绠卞彿锛�" + outLocBoxC.getBoxNo() + "鍗峰彿锛�" + outLocBoxC.getRoll() + " ==銆嬪嚭搴撹緭鍏ュ緟鍒ょ姸鎬侊細" + outLocBoxC.getDanger() + "銆佸簱瀛樼姸鎬侊細" + locDetlSou.getDanger$() + "銆傜姸鎬佷笉鍖归厤銆�===]";
continue;
-// throw new CoolException("绠卞彿锛�"+outLocBoxC[0]+" 鏈煡璇㈠埌鏁版嵁锛侊紒锛�");
}
- if (signDanger){
- if (!locDetlSou.getDanger$().equals(outLocBoxC[4])) {
- sign = false;
- errorMsgOrderLoc = errorMsgOrderLoc + "[===銆�" + "绠卞彿锛�" + outLocBoxC[0] + " ==銆嬪嚭搴撹緭鍏ュ緟鍒ょ姸鎬侊細" + outLocBoxC[4] + "銆佸簱瀛樼姸鎬侊細" + locDetlSou.getDanger$() + "銆傜姸鎬佷笉鍖归厤銆�===]";
- continue;
- }
- }
+ }
+ if (!outLocBoxCNew.contains(outLocBoxC.getBoxNo()) && !locDetlSou.getLocNo().equals("鏃犲簱瀛�")) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlSou.getLocNo()));
if (Cools.isEmpty(locMast)) {
- sign = false;
- errorMsgOrderLoc = errorMsgOrderLoc + "[===銆�" + "绠卞彿锛�" + outLocBoxC[0] + " 鎵�鍦ㄥ簱浣嶄笉婊¤冻鍑哄簱鏉′欢锛侊紒锛佹湭鏌ヨ鍒版绠卞彿鎵�鍦ㄥ簱浣�" + "銆�===]";
- continue;
- }
- if (!locMast.getLocSts().equals("F")) {
- sign = false;
- errorMsgOrderLoc = errorMsgOrderLoc + "[===銆�" + "绠卞彿锛�" + outLocBoxC[0] + " 鎵�鍦ㄥ簱浣嶄笉婊¤冻鍑哄簱鏉′欢锛侊紒锛佸簱浣嶇姸鎬佷笉涓篎锛侊紒锛佸簱浣嶇姸鎬侊細" + locMast.getLocSts$() + "銆�===]";
- continue;
- }
-
- // 鐩爣搴撲綅 ===>> 娴呭簱浣�
- if (Utils.isShallowLoc(slaveProperties, locMast.getLocNo())) {
- String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast.getLocNo());
- LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc));
- if (!Cools.isEmpty(locMast2)) {
- if (locMast2.getLocSts().equals("P") || locMast2.getLocSts().equals("R")) {
- errorMsgOrderLoc = errorMsgOrderLoc + "[===銆�" + "绠卞彿锛�" + outLocBoxC[0] + " 鎵�鍦ㄥ簱浣嶆弧瓒冲嚭搴撴潯浠讹紒锛侊紒浣嗘槸娣卞簱浣嶅湪鍑哄簱涓紒锛侊紒鍥犳浼氬す鏉傚湪鍓嶈竟璁㈠崟鎵ц锛侊紒锛�" + "銆�===]";
+// sign = false;
+ errorMsgOrderLoc = errorMsgOrderLoc + "[===銆�" + "绠卞彿锛�" + outLocBoxC.getBoxNo() + "鍗峰彿锛�" + outLocBoxC.getRoll() + " 鎵�鍦ㄥ簱浣嶄笉婊¤冻鍑哄簱鏉′欢锛侊紒锛佹湭鏌ヨ鍒版绠卞彿鎵�鍦ㄥ簱浣�" + "銆�===]";
+// continue;
+ } else if (!locMast.getLocSts().equals("F")) {
+// sign = false;
+ errorMsgOrderLoc = errorMsgOrderLoc + "[===銆�" + "绠卞彿锛�" + outLocBoxC.getBoxNo() + "鍗峰彿锛�" + outLocBoxC.getRoll() + " 鎵�鍦ㄥ簱浣嶄笉婊¤冻鍑哄簱鏉′欢锛侊紒锛佸簱浣嶇姸鎬佷笉涓篎锛侊紒锛佸簱浣嶇姸鎬侊細" + locMast.getLocSts$() + "銆�===]";
+// continue;
+ } else {
+ // 鐩爣搴撲綅 ===>> 娴呭簱浣�
+ if (Utils.isShallowLoc(slaveProperties, locMast.getLocNo())) {
+ String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast.getLocNo());
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc));
+ if (!Cools.isEmpty(locMast2)) {
+ if (locMast2.getLocSts().equals("P") || locMast2.getLocSts().equals("R")) {
+ errorMsgOrderLoc = errorMsgOrderLoc + "[===銆�" + "绠卞彿锛�" + outLocBoxC.getBoxNo() + "鍗峰彿锛�" + outLocBoxC.getRoll() + " 鎵�鍦ㄥ簱浣嶆弧瓒冲嚭搴撴潯浠讹紒锛侊紒浣嗘槸鐩搁偦搴撲綅鍦ㄥ嚭搴撲腑锛侊紒锛佸洜姝や細澶规潅鍦ㄥ墠杈硅鍗曟墽琛岋紒锛侊紒" + "銆�===]";
+ }
}
}
}
-
- if (sign) {
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
- .eq("loc_no", locDetlSou.getLocNo()).eq("origin", locDetlSou.getOrigin()));
- for (LocDetl locDetl : locDetls) {
- total++;
- String[] locDetlNow = new String[5];
- locDetlNow[0] = locDetl.getBatch();
- locDetlNow[1] = outLocBoxC[1];
- locDetlNow[2] = outLocBoxC[2];
- locDetlNow[3] = outLocBoxC[3];
- locDetlNow[4] = outLocBoxC[4];
- outLocBoxCList.add(locDetlNow);
- outLocBoxCNew.add(outLocBoxC[0]);
+ }
+ if (sign && !outLocRollListNew.contains(outLocBoxC.getRoll()) && !locDetlSou.getLocNo().equals("鏃犲簱瀛�")) {
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+ .eq("loc_no", locDetlSou.getLocNo()).eq("origin", locDetlSou.getOrigin()));
+ for (LocDetl locDetl : locDetls) {
+ if (!outLocRollListNew.contains(locDetl.getModel())){
+ if (!outLocRollListOld.contains(locDetl.getModel())){
+ total++;
+ OrderOutLocBoxCsUtilParam orderOutLocBoxCsUtilParam = new OrderOutLocBoxCsUtilParam(locDetl.getBatch(),locDetl.getModel(), outLocBoxC);
+ orderOutLocBoxCsUtilParam.setMemo("闄勫甫鍑哄簱");
+ orderOutLocBoxCsUtilParam.setDanger(locDetl.getDanger$());
+ outLocBoxCList.add(orderOutLocBoxCsUtilParam);
+ outLocBoxCNew.add(outLocBoxC.getBoxNo());
+ outLocRollListNew.add(outLocBoxC.getRoll());
+ } else {
+ if (locDetlSou.getBatch().equals(locDetl.getBatch()) && locDetlSou.getModel().equals(locDetl.getModel())) {
+ total++;
+ outLocBoxCList.add(outLocBoxC);
+ outLocBoxCNew.add(outLocBoxC.getBoxNo());
+ outLocRollListNew.add(outLocBoxC.getRoll());
+ }
+ }
}
+ }
+ } else if (sign && !outLocRollListNew.contains(outLocBoxC.getRoll()) && locDetlSou.getLocNo().equals("鏃犲簱瀛�")) {
+ if (!outLocRollListNew.contains(locDetlSou.getModel())){
+ total++;
+ outLocBoxCList.add(outLocBoxC);
+ outLocBoxCNew.add(outLocBoxC.getBoxNo());
+ outLocRollListNew.add(outLocBoxC.getRoll());
}
}
}
- for (String[] outLocBoxC : outLocBoxCList) {
- LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", outLocBoxC[0]));
+ for (OrderOutLocBoxCsUtilParam outLocBoxC : outLocBoxCList) {
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", outLocBoxC.getBoxNo()).eq("model", outLocBoxC.getRoll()));
if (Cools.isEmpty(locDetl)) {
- total--;
- continue;
+// total--;
+// continue;
+ locDetl = new LocDetl();
+ locDetl.setBatch(outLocBoxC.getBoxNo());
+ locDetl.setModel(outLocBoxC.getRoll());
+ locDetl.setLocNo("鏃犲簱瀛�");
}
- if (!Cools.isEmpty(outLocBoxC[3])) {
- String memo = Cools.isEmpty(locDetl.getMemo()) ? "" : locDetl.getMemo() + "锛�";
- locDetl.setMemo(memo + DateUtils.convert(new Date(), DateUtils.yyyyMMdd_C) + "澶囨敞锛�" + outLocBoxC[3]);
- } else if (Cools.isEmpty(locDetl.getMemo())) {
- locDetl.setMemo(outLocBoxC[3]);
+ if (!Cools.isEmpty(outLocBoxC.getMemo())) {
+ if (Cools.isEmpty(locDetl.getMemo())) {
+ locDetl.setMemo(DateUtils.convert(new Date(), DateUtils.yyyyMMdd_C) + "澶囨敞锛�" + outLocBoxC.getMemo());
+ } else {
+ String memo = Cools.isEmpty(locDetl.getMemo()) ? "" : locDetl.getMemo() + "锛�";
+ locDetl.setMemo(memo + DateUtils.convert(new Date(), DateUtils.yyyyMMdd_C) + "澶囨敞锛�" + outLocBoxC.getMemo());
+ }
}
LocDto locDto = new LocDto(locDetl);
locDtos.add(locDto);
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index 3d64b44..6fa4030 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -48,8 +48,10 @@
page: true,
cellMinWidth: 100,
cols: [[
- {type: 'numbers'},
- {field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
+ // {type: 'numbers'},
+ {field: 'itemName', align: 'center', title: '缁勮揣鍗曞彿'},
+ {field: 'cstmrName', align: 'center', title: '瀹㈡埛鍚嶇О'},
+ {field: 'orderNo', title: '娴佹按鍙�', templet: '#orderNoTpl'},
{field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
{field: 'tkType', align: 'center', title: 'TK', minWidth: 160, width: 160,hide: true},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
@@ -176,6 +178,76 @@
doDel(data.id);
} else if (layEvent === 'complete') {//杞疄闄呯粍璐у崟
doModify(data.id, data.orderNo, 11);
+ } else if (layEvent === 'look') {
+ var $a = $(obj.tr).find('a[lay-event="look"]');
+ var offset = $a.offset();
+ var top = offset.top;
+ var left = offset.left;
+ layer.open({
+ type: 1,
+ title: false,
+ area: '1020px',
+ offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
+ shade: .01,
+ shadeClose: true,
+ fixed: false,
+ content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
+ success: function (layero) {
+ table.render({
+ elem: '#lookSSXMTable',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/order/pakout/orderDetl/list/auth',
+ where: {
+ order_id: data.id
+ },
+ page: true,
+ cellMinWidth: 100,
+ cols: [[
+ {type: 'numbers'},
+ {field: 'matnr', title: '瑙勬牸', width: 160},
+ // {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
+ {field: 'batch', align: 'center', title: '绠卞彿', width: 160},
+ {field: 'model', align: 'center',title: '鍗峰彿', width: 160},
+ // {field: 'anfme', align: 'center', title: '鏁伴噺'},
+ // {field: 'workQty', title: '浣滀笟鏁伴噺'},
+
+ // {field: 'unit', title: '鍗曚綅'},
+ // {
+ // field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
+ // return util.toDateString(d.createTime);
+ // }, width: 180
+ // },
+ // {field: 'inQty', title: '宸插叆搴撻噺'},
+ // {field: 'color', title: '棰滆壊'},
+ // {field: 'specs', align: 'center', title: '鎺ュご'},
+ {field: 'danger$', align: 'center', title: '寰呭垽', width: 80},
+ {field: 'manu', title: '璐т綅', align: 'center', width: 100},
+ {field: 'memo', align: 'center', title: '澶囨敞'},
+ {field: 'status$', align: 'center', title: '鐘舵��', style: 'font-weight: bold'},
+ // {field: 'source$', align: 'center', title: '鏄惁纭', style: 'font-weight: bold'}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function () {
+ $(layero).find('.layui-table-view').css('margin', '0');
+ },
+ size: ''
+ });
+ }
+ });
}
});
diff --git a/src/main/webapp/views/orderPakout/order.html b/src/main/webapp/views/orderPakout/order.html
index ff80cf9..ff96f53 100644
--- a/src/main/webapp/views/orderPakout/order.html
+++ b/src/main/webapp/views/orderPakout/order.html
@@ -54,6 +54,16 @@
<input name="order_no" class="layui-input" type="text" placeholder="杈撳叆鍗曟嵁缂栧彿"/>
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline mr0">
+ <input name="cstmr_name" class="layui-input" type="text" placeholder="杈撳叆瀹㈡埛鍚嶇О"/>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline mr0">
+ <input name="item_name" class="layui-input" type="text" placeholder="杈撳叆缁勮揣鍗曞彿"/>
+ </div>
+ </div>
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
<input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
@@ -100,7 +110,7 @@
{{# if (d.settle != 11) { }}
<a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
{{# } }}
- {{# if (d.settle == 0 || d.settle == 1) { }}
+ {{# if (d.settle == 10) { }}
<a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">鐢熸垚瀹為檯缁勮揣鍗�</a>
{{# } }}
</script>
diff --git a/src/main/webapp/views/orderPakout/out.html b/src/main/webapp/views/orderPakout/out.html
index 3dc4b9d..4a18be6 100644
--- a/src/main/webapp/views/orderPakout/out.html
+++ b/src/main/webapp/views/orderPakout/out.html
@@ -176,7 +176,7 @@
<div class="ew-select-fixed">
<select class="order-sta-select" lay-filter="tbBasicTbStaNos">
{{#if (d.staNos!=null) {}}
- {{# for(let i=0; i<d.staNos.length; i++) { }}
+ {{# for(let i=0; i < d.staNos.length; i++) { }}
<option value="{{d.staNos[i]}}">{{d.staNos[i]}}</option>
{{# } }}
{{# } }}
--
Gitblit v1.9.1