From 1cc361ec5fca7550ba01f0a6ecf058e84a5a20ad Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期六, 18 十月 2025 16:25:18 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/service/MatBarcodeService.java | 3
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 11 +-
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 8 +
src/main/webapp/static/js/mat/mat.js | 69 +++++++++++++
src/main/webapp/views/mat/mat.html | 119 +++++++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java | 24 ++++
src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java | 1
src/main/java/com/zy/asrs/controller/MatController.java | 30 +++++
src/main/java/com/zy/common/web/WcsController.java | 1
src/main/webapp/static/js/common.js | 28 ++--
10 files changed, 269 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 85aceaf..35c113e 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -10,13 +10,11 @@
import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.InOut;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.MatPrint;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.InOutService;
+import com.zy.asrs.service.MatBarcodeService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.common.CodeRes;
@@ -46,6 +44,8 @@
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private InOutService inOutService;
+ @Autowired
+ private MatBarcodeService matBarcodeService;
@RequestMapping(value = "/mat/auto/matnr/auth")
public R autoMatnr(){
@@ -153,12 +153,34 @@
if (Cools.isEmpty(mat) || null==mat.getId()){
return R.error();
}
+ if (mat.getColor().equals("姝ｅ父")){
+ mat.setColor("鎶ュ簾");
+ }else if (mat.getColor().equals("鎶ュ簾")){
+ mat.setColor("姝ｅ父");
+ }
+ InOut inOut = inOutService.selectByMatnr(mat.getMatnr());
+ inOut.setMatnr(mat.getMatnr());
+ inOut.setMaktx(mat.getMaktx());
+ inOut.setColor(mat.getColor());
+ inOut.setSpecs(mat.getSpecs());
mat.setUpdateBy(getUserId());
mat.setUpdateTime(new Date());
matService.updateById(mat);
+ inOutService.updateById(inOut);
return R.ok();
}
+ /*鐗╂枡鎵樼洏缁戝畾*/
+// @RequestMapping(value = "/mat/barcode/auth")
+// @ManagerAuth
+// public R addBarcodeMatnr(Mat mat) {
+// if (Cools.isEmpty(mat.getUnit())){
+// return R.error(BaseRes.PARAM);
+// }
+// matBarcodeService.addBarcodeMatnrTwo(mat);
+// return R.ok();
+// }
+
@RequestMapping(value = "/mat/delete/auth")
@ManagerAuth
public R delete(@RequestParam String param){
diff --git a/src/main/java/com/zy/asrs/service/MatBarcodeService.java b/src/main/java/com/zy/asrs/service/MatBarcodeService.java
index 6f4ae3f..1cdca7d 100644
--- a/src/main/java/com/zy/asrs/service/MatBarcodeService.java
+++ b/src/main/java/com/zy/asrs/service/MatBarcodeService.java
@@ -1,6 +1,7 @@
package com.zy.asrs.service;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MatBarcode;
import com.zy.asrs.entity.WaitPakin;
import org.springframework.stereotype.Service;
@@ -14,4 +15,6 @@
void deleteMatBarcode(List<MatBarcode> list);
void addBarcodeMatnr(WaitPakin waitPakin);
+
+ void addBarcodeMatnrTwo(Mat mat);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java
index d31b45d..8040092 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java
@@ -57,4 +57,28 @@
throw new CoolException("鐗╂枡鎵樼洏缁戝畾澶辫触");
}
}
+
+ @Override
+ public void addBarcodeMatnrTwo(Mat mat) {
+ Mat m = matService.selectById(mat);
+ if (m == null){
+ throw new CoolException("鐗╂枡涓嶅瓨鍦紝璇峰厛娣诲姞鐗╂枡鏁版嵁");
+ }
+ MatBarcode matBarcode = matBarcodeMapper.selectByMatnr(mat.getMatnr());
+ if (matBarcode != null){
+ throw new CoolException("璇ョ墿鏂欏凡缁忕粦瀹氭墭鐩橈紝璇峰嬁閲嶅缁戝畾");
+ }
+ if (mat.getColor().equals("鎶ュ簾")){
+ throw new CoolException("璇ョ墿鏂欏凡鎶ュ簾锛岃鍕跨粦瀹�");
+ }
+ MatBarcode mb=new MatBarcode();
+ mb.setZpallet(mat.getUnit());
+ mb.setMatnr(mat.getMatnr());
+ mb.setMaktx(mat.getMaktx());
+ mb.setSpecs(mat.getSpecs());
+ mb.setModel(mat.getModel());
+ if (!matBarcodeService.insert(mb)){
+ throw new CoolException("鐗╂枡鎵樼洏缁戝畾澶辫触");
+ }
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java
index 8c0c0e2..346238c 100644
--- a/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java
@@ -56,6 +56,7 @@
waitPakin1.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin1.setAnfme(1.0); // 鏁伴噺
waitPakin1.setStatus("Y"); // 鐘舵��
+ waitPakin1.setModel(mat.getName());
//waitPakin1.setAppeUser(waitPakin.getAppeUser());
waitPakin1.setAppeTime(now);
//waitPakin1.setModiUser(waitPakin.getAppeUser());
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 5833612..43bc75a 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -772,14 +772,18 @@
if (Cools.isEmpty(wrkMast)) {
throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
}
- if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() >= 14) {
+ if (wrkMast.getWrkSts() == 4 || (wrkMast.getWrkSts() >= 14 && wrkMast.getWrkSts() <= 15)) {
throw new CoolException("褰撳墠宸ヤ綔妗ｅ凡瀹屾垚");
}
// 鍏ュ簱 + 搴撲綅杞Щ
if (wrkMast.getWrkSts() < 4 || (wrkMast.getWrkSts() > 10 && wrkMast.getIoType() == 11)) {
wrkMast.setWrkSts(4L);
// 鍑哄簱
- } else if (wrkMast.getWrkSts() > 10) {
+ } else if (wrkMast.getWrkSts() > 10 && wrkMast.getWrkSts() < 15) {
+ wrkMast.setWrkSts(14L);
+ }else if(wrkMast.getWrkSts() >= 103 && wrkMast.getWrkSts() <= 105){
+ wrkMast.setWrkSts(4L);
+ }else if (wrkMast.getWrkSts() >= 106 && wrkMast.getWrkSts() <=108){
wrkMast.setWrkSts(14L);
}
Date now = new Date();
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index bd61ed2..e173bdb 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -120,13 +120,14 @@
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
+ locDetl.setModel(wrkDetl.getModel());
InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
if (inOut != null){
inOut.setTemp1("鍦ㄥ簱");
- inOut.setModiTime(now.toString());
+// inOut.setModiTime(now.toString());
}
- if (inOutService.updateById(inOut)){
+ if (!inOutService.updateById(inOut)){
return FAIL.setMsg("鏇存柊妯″叿灞炴�уけ璐�");
}
@@ -186,7 +187,7 @@
inOut.setTemp1("涓嶅湪搴�");
// inOut.setModiTime(now.toString());
}
- if (inOutService.updateById(inOut)){
+ if (!inOutService.updateById(inOut)){
return FAIL.setMsg("鏇存柊妯″叿灞炴�уけ璐�");
}
@@ -254,7 +255,7 @@
inOut.setTemp1("鍦ㄥ簱");
// inOut.setModiTime(now.toString());
}
- if (inOutService.updateById(inOut)){
+ if (!inOutService.updateById(inOut)){
return FAIL.setMsg("鏇存柊妯″叿灞炴�уけ璐�");
}
@@ -396,7 +397,7 @@
inOut.setTemp1("涓嶅湪搴�");
// inOut.setModiTime(now.toString());
}
- if (inOutService.updateById(inOut)){
+ if (!inOutService.updateById(inOut)){
return FAIL.setMsg("鏇存柊妯″叿灞炴�уけ璐�");
}
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 197356e..856304a 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -373,6 +373,7 @@
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
+ wrkDetl.setModel(waitPakin.getModel());
if (!Cools.isEmpty(waitPakin.getOrderNo())) {
Order order = orderService.selectByNo(waitPakin.getOrderNo());
if (order != null) {
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 624d8e1..446f4a5 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -192,9 +192,9 @@
,{field: 'name', align: 'center',title: '濂楀彿'}
,{field: 'color', align: 'center',title: '鐘舵��', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
- ,{field: 'unit', align: 'center',title: '鍗曚綅'}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: '鏉愯川'}
+ ,{field: 'sku', align: 'center',title: '鏉愯川', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
@@ -203,7 +203,7 @@
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
,{field: 'weight', align: 'center',title: '鎬婚噸閲�', hide: true}
- ,{field: 'length', align: 'center',title: '妯″瓟鏁�', hide: false}
+ ,{field: 'length', align: 'center',title: '妯″瓟鏁�', hide: true}
,{field: 'volume', align: 'center',title: '寮�妯″鍘�', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
@@ -221,29 +221,29 @@
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
,{field: 'proType', align: 'center',title: '灞炴��', hide: false}
- ,{field: 'temp1', align: 'center',title: '鍚嶇О鎬荤О', hide: false}
+ ,{field: 'temp1', align: 'center',title: '鍚嶇О鎬荤О', hide: true}
,{field: 'outOrderNo', align: 'center',title: '鍚堝悓鍙�', hide: true}
- ,{field: 'temp2', align: 'center',title: '瀹㈡埛鍥惧彿', hide: false}
+ ,{field: 'temp2', align: 'center',title: '瀹㈡埛鍥惧彿', hide: true}
]
var detlCols = [
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿锛堝搧鍙凤級', sort:true}
- ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: false}
+ ,{field: 'model', align: 'center',title: '濂楀彿', hide: false}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', sort:true}
- ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
,{field: 'spgNO', align: 'center',title: '娲惧伐鍗曞彿', hide:true,sort:true}
,{field: 'batch', align: 'center',title: '鎵规', hide:true,sort:true}
- ,{field: 'outOrderNo', align: 'center',title: '鍚堝悓鍙�', sort:true}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
+ ,{field: 'outOrderNo', align: 'center',title: '鍚堝悓鍙�', sort:true, hide: true}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false}
,{field: 'specs', align: 'center',title: '瑙勬牸', hide: false}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: '鏉愯川', hide: false}
+ ,{field: 'sku', align: 'center',title: '鏉愯川', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
@@ -251,8 +251,8 @@
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鎬婚噸閲�', hide: false}
- ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: false}
+ ,{field: 'weight', align: 'center',title: '鎬婚噸閲�', hide: true}
+ ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', align: 'center',title: '瀹㈡埛鍚嶇О', hide:false }
@@ -264,8 +264,8 @@
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
,{field: 'proType', align: 'center',title: '灞炴��', hide: false}
- ,{field: 'temp1', align: 'center',title: '鍚嶇О鎬荤О', hide: false}
- ,{field: 'temp2', align: 'center',title: '瀹㈡埛鍥惧彿', hide: false}
+ ,{field: 'temp1', align: 'center',title: '鍚嶇О鎬荤О', hide: true}
+ ,{field: 'temp2', align: 'center',title: '瀹㈡埛鍥惧彿', hide: true}
]
diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index 6fa9556..a7c3636 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -237,6 +237,9 @@
case 'edit':
showEditModel(data)
break;
+ case 'editBarcode':
+ showEditModelBarcode(data)
+ break;
}
});
@@ -312,6 +315,72 @@
});
}
+ // /* 鏄剧ず琛ㄥ崟寮圭獥 */
+ // function showEditModelBarcode(mData) {
+ // admin.open({
+ // type: 1,
+ // area: '600px',
+ // title: '缁戝畾鍟嗗搧',
+ // content: $('#editDialogBarcode').html(),
+ // success: function (layero, dIndex) {
+ // // 鍥炴樉琛ㄥ崟鏁版嵁
+ // form.val('detail', mData);
+ // // 琛ㄥ崟鎻愪氦浜嬩欢
+ // form.on('submit(editSubmit)', function (data) {
+ // console.log(data)
+ // data.field.tagId = insXmSel.getValue('valueStr');
+ // if (isEmpty(data.field.tagId)) {
+ // layer.msg('鍒嗙被涓嶈兘涓虹┖', {icon: 2});
+ // return false;
+ // }
+ // var loadIndex = layer.load(2);
+ // $.ajax({
+ // url: baseUrl+"/mat/barcode/auth",
+ // headers: {'token': localStorage.getItem('token')},
+ // data: data.field,
+ // method: 'POST',
+ // success: function (res) {
+ // layer.close(loadIndex);
+ // if (res.code === 200){
+ // layer.close(dIndex);
+ // layer.msg(res.msg, {icon: 1});
+ // $(".layui-laypage-btn")[0].click();
+ // } else if (res.code === 403){
+ // top.location.href = baseUrl+"/";
+ // }else {
+ // layer.msg(res.msg, {icon: 2});
+ // }
+ // }
+ // })
+ // return false;
+ // });
+ // // 娓叉煋涓嬫媺鏍�
+ // var insXmSel = xmSelect.render({
+ // el: '#tagSelBarcode',
+ // height: '250px',
+ // data: insTb.options.data,
+ // initValue: mData ? [mData.tagId] : [],
+ // model: {label: {type: 'text'}},
+ // prop: {
+ // name: 'name',
+ // value: 'id'
+ // },
+ // radio: true,
+ // clickClose: true,
+ // tree: {
+ // show: true,
+ // indent: 15,
+ // strict: false,
+ // expandedKeys: true
+ // }
+ // });
+ // // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
+ // $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ // layui.form.render('select');
+ // }
+ // });
+ // }
+
// 妯℃澘閫夋嫨
form.on('radio(selectTemplateRadio)', function (data) {
$('.template-preview').hide();
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 7dd2e5d..a9ff054 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -148,6 +148,7 @@
<script type="text/html" id="operate">
<a class="layui-btn layui-btn-xs btn-edit layui-btn-primary" lay-event="edit">淇敼</a>
+<!-- <a class="layui-btn layui-btn-xs btn-edit layui-btn-primary" lay-event="editBarcode">缁戝畾</a>-->
<button class="layui-btn layui-btn-xs btn-print" lay-event="btnPrint">鎵撳嵃</button>
</script>
@@ -270,6 +271,124 @@
</form>
</script>
+
+
+<!--<!– 琛ㄥ崟寮圭獥 –>-->
+<!--<script type="text/html" id="editDialogBarcode">-->
+<!-- <form id="detailBarcode" lay-filter="detail" class="layui-form admin-form">-->
+<!-- <input name="id" type="hidden">-->
+<!-- <input name="uuid" type="hidden">-->
+<!-- <input name="nodeId" type="hidden">-->
+<!-- <input name="tag_id" type="hidden">-->
+<!-- <input name="model" type="hidden">-->
+<!-- <input name="name" type="hidden">-->
+<!-- <input name="batch" type="hidden">-->
+<!-- <input name="docId" type="hidden">-->
+<!-- <input name="docNum" type="hidden">-->
+<!-- <input name="custName" type="hidden">-->
+<!-- <input name="itemNum" type="hidden">-->
+<!-- <input name="count" type="hidden">-->
+<!-- <input name="weight" type="hidden">-->
+<!-- <input name="status" type="hidden">-->
+<!-- <input name="createBy" type="hidden">-->
+<!-- <input name="updateTime$" type="hidden">-->
+<!-- <input name="updateBy" type="hidden">-->
+<!-- <div class="layui-row">-->
+
+<!-- <div class="layui-col-md6">-->
+
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">鍒嗙被</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <div id="tagSelBarcode" class="ew-xmselect-tree"></div>-->
+<!-- </div>-->
+<!-- </div>-->
+
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">鍨嬫潗鍨嬪彿</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input name="maktx" placeholder="璇疯緭鍏ュ瀷鏉愬瀷鍙�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">-->
+<!-- </div>-->
+<!-- </div>-->
+
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">妯″叿鍚嶇О</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input name="matnr" placeholder="璇疯緭鍏ユā鍏峰悕绉�" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
+
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">濂楀彿</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input name="name" placeholder="璇疯緭鍏ュ鍙�" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
+
+<!-- <!– <div class="layui-form-item">–>-->
+<!-- <!– <label class="layui-form-label">寮�妯″鍘�</label>–>-->
+<!-- <!– <div class="layui-input-block">–>-->
+<!-- <!– <input name="volume" placeholder="璇疯緭鍏ュ紑妯″鍘�" class="layui-input">–>-->
+<!-- <!– </div>–>-->
+<!-- <!– </div>–>-->
+
+<!-- </div>-->
+
+<!-- <div class="layui-col-md6">-->
+<!-- <!– <div class="layui-form-item">–>-->
+<!-- <!– <label class="layui-form-label layui-form-required">妯″叿鍚嶇О</label>–>-->
+<!-- <!– <div class="layui-input-block">–>-->
+<!-- <!– <input id="matnr" name="matnr" placeholder="璇疯緭鍏ユā鍏峰悕绉�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">–>-->
+<!-- <!– </div>–>-->
+<!-- <!– </div>–>-->
+
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">瑙勬牸</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input name="specs" placeholder="璇疯緭鍏ヤ唬鐮�" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">鎵樼洏鐮�</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input name="unit" placeholder="璇疯緭鍏ユ墭鐩樼爜" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
+
+<!-- <!– <div class="layui-form-item">–>-->
+<!-- <!– <label class="layui-form-label">澶囨敞</label>–>-->
+<!-- <!– <div class="layui-input-block">–>-->
+<!-- <!– <input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">–>-->
+<!-- <!– </div>–>-->
+<!-- <!– </div>–>-->
+
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">鐘舵��</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input name="color" placeholder="" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
+<!--<!– <div class="layui-form-item">–>-->
+<!--<!– <label class="layui-form-label">鐘舵��</label>–>-->
+<!--<!– <div class="layui-input-block">–>-->
+<!--<!– <select id="colorBarcode" name="color" lay-filter="color" placeholder="璇烽�夋嫨鐘舵��">–>-->
+<!--<!– <option value="">璇烽�夋嫨鐘舵��</option>–>-->
+<!--<!– <option value="姝ｅ父" name="color" class="layui-input">姝ｅ父</option>–>-->
+<!--<!– <option value="鎶ュ簾" name="color" class="layui-input">鎶ュ簾</option>–>-->
+<!--<!– </select>–>-->
+<!--<!– </div>–>-->
+<!--<!– </div>–>-->
+
+<!-- </div>-->
+<!-- </div>-->
+<!-- <hr class="layui-bg-gray">-->
+<!-- <div class="layui-form-item text-right">-->
+<!-- <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>-->
+<!-- <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>-->
+<!-- </div>-->
+<!-- </form>-->
+<!--</script>-->
+
<!-- 鎵撳嵃鎿嶄綔寮圭獥 -->
<div id="printDataDiv" style="display: none;padding: 20px">
<div class="layui-form" style="text-align: center">
--
Gitblit v1.9.1