From 828b592b5f8e31204f93bcc2ea0c5866bdc0dcf0 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 06 十二月 2023 20:18:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1
---
src/main/webapp/static/js/locDetl/locDetl.js | 4
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 4
src/main/webapp/static/js/allLocDetl/locDetl.js | 4
src/main/webapp/static/js/nodeLoc/nodeLoc.js | 107 ++++++++-------
src/main/java/com/zy/asrs/controller/NodeController.java | 2
src/main/java/com/zy/asrs/utils/Utils.java | 2
src/main/webapp/static/js/order/out.js | 4
src/main/webapp/views/nodeLoc/nodeLoc.html | 233 +++------------------------------
src/main/java/com/zy/common/model/TaskDto.java | 32 +++-
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 2
src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java | 2
src/main/java/com/zy/common/service/CommonService.java | 13 +
12 files changed, 122 insertions(+), 287 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/NodeController.java b/src/main/java/com/zy/asrs/controller/NodeController.java
index 893a6d3..ab6619a 100644
--- a/src/main/java/com/zy/asrs/controller/NodeController.java
+++ b/src/main/java/com/zy/asrs/controller/NodeController.java
@@ -76,7 +76,7 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
EntityWrapper<Node> wrapper = new EntityWrapper<>();
- //wrapper.ne("type",3);
+ wrapper.ne("type",3);
excludeTrash(param);
convert(param, wrapper);
hostEq(wrapper);
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index f6b5c47..12add0c 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -149,8 +149,8 @@
public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch, String csocode, String isocode) {
EntityWrapper<AgvLocDetl> wrapper = new EntityWrapper<>();
- Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
wrapper.eq("loc_no", locNo);
+ Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
if (anfme <= 0) {
return this.baseMapper.deleteLocDetl(locNo,anfme,matnr,batch,csocode,isocode) > 0;
} else {
@@ -165,7 +165,7 @@
if(Cools.isEmpty(condition)){
wrapper.andNew().eq(column,"").or().isNull(column);
}else {
- wrapper.eq(column,condition);
+ wrapper.andNew().eq(column,condition);
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index ef94416..ffcc871 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -258,7 +258,7 @@
if(Cools.isEmpty(condition)){
wrapper.andNew().eq(column,"").or().isNull(column);
}else {
- wrapper.eq(column,condition);
+ wrapper.andNew().eq(column,condition);
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
index 6a6a33f..f7fd388 100644
--- a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
@@ -239,7 +239,7 @@
if(Cools.isEmpty(condition)){
wrapper.andNew().eq(column,"").or().isNull(column);
}else {
- wrapper.eq(column,condition);
+ wrapper.andNew().eq(column,condition);
}
}
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index e03dc0e..d456395 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -441,7 +441,7 @@
if(Cools.isEmpty(condition) || "null".equals(condition)){
wrapper.andNew().eq(column,"").or().isNull(column);
}else {
- wrapper.eq(column,condition);
+ wrapper.andNew().eq(column,condition);
}
}
diff --git a/src/main/java/com/zy/common/model/TaskDto.java b/src/main/java/com/zy/common/model/TaskDto.java
index 515ccd5..494c703 100644
--- a/src/main/java/com/zy/common/model/TaskDto.java
+++ b/src/main/java/com/zy/common/model/TaskDto.java
@@ -110,22 +110,34 @@
if (!dto.getMatnr().equals(locDetl.getMatnr())) {
continue;
}
- if (Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(locDetl.getBatch())) {
+ if(!Cools.eq(dto.getBatch(),locDetl.getBatch())){
continue;
}
- if (!Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(locDetl.getBatch())) {
+ if(!Cools.eq(dto.getCsocode(),locDetl.getThreeCode())){
continue;
}
- if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(locDetl.getBatch())) {
- if (!dto.getBatch().equals(locDetl.getBatch())) {
- continue;
- }
+ if(!Cools.eq(dto.getIsoseq(),locDetl.getDeadTime())){
+ continue;
}
- if (!Cools.isEmpty(dto.getContainerCode()) && !Cools.isEmpty(locDetl.getSuppCode())) {
- if (!dto.getContainerCode().equals(locDetl.getSuppCode())) {
- continue;
- }
+ if(!Cools.eq(dto.getContainerCode(),locDetl.getSuppCode())){
+ continue;
}
+// if (Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(locDetl.getBatch())) {
+// continue;
+// }
+// if (!Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(locDetl.getBatch())) {
+// continue;
+// }
+// if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(locDetl.getBatch())) {
+// if (!dto.getBatch().equals(locDetl.getBatch())) {
+// continue;
+// }
+// }
+// if (!Cools.isEmpty(dto.getContainerCode()) && !Cools.isEmpty(locDetl.getSuppCode())) {
+// if (!dto.getContainerCode().equals(locDetl.getSuppCode())) {
+// continue;
+// }
+// }
if (dto.getAnfme() > locDetl.getAnfme()) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 1388298..2718933 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -413,36 +413,45 @@
if(!VersionUtils.checkLocType(locMast0,locTypeDto)){
continue;
}
+ //鍗曞搧鐗╂枡
if (matNos.size() == 1) {
- //鍗曞搧鐗╂枡
+ //濡傛灉涓嶆槸娣辨祬锛屽垯鐩存帴杩斿洖褰撳墠搴撲綅
if(Cools.isEmpty(Utils.getGroupDeepLoc(locMast0.getLocNo()))){
return locMast0;
}else{
List<String> groupInnerLoc = Utils.getGroupInnerLoc(locMast0.getLocNo());
+ //濡傛灉鏄繁娴呭簱浣嶏紝浣嗘槸鍐呮祴鏃犲簱浣嶇殑鎯呭喌涓嬶紝鍒欑洿鎺ヨ繑鍥炲綋鍓嶅簱浣�
if (Cools.isEmpty(groupInnerLoc)) {
return locMast0;
}else {
//鑾峰彇鏈�娣辩殑搴撲綅
String loc = groupInnerLoc.get(groupInnerLoc.size() - 1);
LocMast locMast1 = locMastService.selectByLoc(loc);
+ //濡傛灉鏈�娣辨祴搴撲綅涓虹┖搴撲綅锛屽垯鐩存帴杩斿洖鏈�娣卞簱浣�
if("O".equals(locMast1.getLocSts())){
return locMast1;
}else {
+ //濡傛灉鏈�娣卞簱浣嶇姸鎬佷笉涓篎鎴栬�匫锛屽垯璺冲嚭褰撳墠鐨勬繁娴呭簱浣嶆煡鎵�
if(!"F".equals(locMast1.getLocSts())){
continue;
}
List<LocDetl> locDetls = locDetlService.selectByLocNo(loc);
+ //濡傛灉褰撳墠娣卞簱浣嶇墿鏂欎笌鍏ュ簱鐗╂枡涓嶇浉绗︼紝鍒欒烦鍑哄綋鍓嶆繁娴呭簱浣嶆煡鎵�
if(!Cools.eq(locDetls.get(0).getMatnr(),matNos.get(0))){
continue;
}
+ //浠庨噷寰�澶栦緷娆￠亶鍘嗚缁勬繁娴呭簱浣�
for (int i=groupInnerLoc.size()-1; i>=0 ;i--){
LocMast locMast2 = locMastService.selectByLoc(groupInnerLoc.get(i));
if("O".equals(locMast2.getLocSts())){
+ //濡傛灉娣卞簱浣嶄腑鍚湁0鐘舵�佺殑搴撲綅锛屽垯鐩存帴杩斿洖璇ュ簱浣�
return locMast2;
}else if("F".equals(locMast2.getLocSts())){
+ //濡傛灉瀵逛簬locaMast0鏈�杩戠殑涓�涓簱浣嶄篃涓篎鐘舵�侊紝鍒欒繑鍥瀕ocaMastO
if(i==0){
- return locMast1;
+ return locMast0;
}else {
+ //濡傛灉璇ョ粍娣辨祬搴撲綅涓惈鏈夋棦涓嶄负F涔熶笉涓篛鐨勫簱浣嶏紝鍒欒烦鍑哄綋鍓嶆繁娴呭簱浣嶆煡鎵�
continue;
}
}else {
diff --git a/src/main/webapp/static/js/allLocDetl/locDetl.js b/src/main/webapp/static/js/allLocDetl/locDetl.js
index b0cbf25..528176a 100644
--- a/src/main/webapp/static/js/allLocDetl/locDetl.js
+++ b/src/main/webapp/static/js/allLocDetl/locDetl.js
@@ -9,8 +9,8 @@
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�', sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'units', align: 'center',title: '閿�鍞鍗曞彿', hide: true}
- ,{field: 'units', align: 'center',title: '閿�鍞鍗曡鍙�', hide: true}
+ ,{field: 'threeCode', align: 'center',title: '閿�鍞鍗曞彿', hide: true}
+ ,{field: 'deadTime', align: 'center',title: '閿�鍞鍗曡鍙�', hide: true}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'specs', align: 'center',title: '瑙勬牸鍨嬪彿', hide: true}
,{field: 'model', align: 'center',title: '閫氱敤鍨嬪彿', hide: true}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index bb3d566..9db9be7 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -9,8 +9,8 @@
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�', sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'units', align: 'center',title: '閿�鍞鍗曞彿', hide: true}
- ,{field: 'units', align: 'center',title: '閿�鍞鍗曡鍙�', hide: true}
+ ,{field: 'threeCode', align: 'center',title: '閿�鍞鍗曞彿', hide: true}
+ ,{field: 'deadTime', align: 'center',title: '閿�鍞鍗曡鍙�', hide: true}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'specs', align: 'center',title: '瑙勬牸鍨嬪彿', hide: true}
,{field: 'model', align: 'center',title: '閫氱敤鍨嬪彿', hide: true}
diff --git a/src/main/webapp/static/js/nodeLoc/nodeLoc.js b/src/main/webapp/static/js/nodeLoc/nodeLoc.js
index d144f92..2fde79e 100644
--- a/src/main/webapp/static/js/nodeLoc/nodeLoc.js
+++ b/src/main/webapp/static/js/nodeLoc/nodeLoc.js
@@ -1,6 +1,9 @@
var pageCurr;
var printMatCodeNos = [];
var admin;
+var printContent = [];
+var insTb;
+var tableIns;
function getCol() {
var cols = [
{type: 'checkbox'}
@@ -28,7 +31,7 @@
var xmSelect = layui.xmSelect;
// 鍟嗗搧鍒嗙被鏁版嵁
- var insTb = treeTable.render({
+ insTb = treeTable.render({
elem: '#tag',
url: baseUrl+'/node/list/auth',
headers: {token: localStorage.getItem('token')},
@@ -191,29 +194,38 @@
});
break;
// 鎵归噺鎵撳嵃
- case "btnPrintBatch":
- printMatCodeNos = [];
- var data = checkStatus.data;
- if (data.length === 0){
- layer.msg('璇烽�夋嫨鎵撳嵃鏁版嵁');
- } else {
- layer.open({
- type: 1,
- title: '鎵归噺鎵撳嵃 [鏁伴噺'+ data.length +']',
- area: ['500px'],
- shadeClose: true,
- content: $('#printDataDiv'),
- success: function(layero, index){
- for (var i = 0; i<data.length;i++) {
- printMatCodeNos.push(data[i].matnr);
- }
- },
- end: function () {
- }
- });
+ case "printBatch":
+ var checkRows = checkStatus.data;
+ printContent = [];
+ if (checkRows.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佹墦鍗扮殑鏁版嵁', {icon: 2});
+ return;
}
+ printContent = checkRows.map(function (d) {
+ if (!d.LAY_INDETERMINATE && d.type === 3) {
+ return d.name;
+ } else {
+ return null;
+ }
+ });
+ layer.open({
+ type: 1,
+ title: '鎵归噺鎵撳嵃 [鏁伴噺'+ printContent.length +']',
+ area: ['500px'],
+ shadeClose: true,
+ content: $('#printDataDiv'),
+ success: function(layero, index){
+ },
+ end: function () {
+ }
+ });
break;
}
+ });
+ // 妯℃澘閫夋嫨
+ form.on('radio(selectTemplateRadio)', function (data) {
+ $('.template-preview').hide();
+ $('#template-preview-'+data.value).show();
});
// 鐩戝惉琛屽伐鍏蜂簨浠�
@@ -325,38 +337,31 @@
// 寮�濮嬫墦鍗�
form.on('submit(doPrint)', function (data) {
var templateNo = data.field.selectTemplate;
- $.ajax({
- url: baseUrl+"/node/print/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {param: printMatCodeNos},
- method: 'POST',
- async: false,
- success: function (res) {
- if (res.code === 200){
- layer.closeAll();
- for (let i=0;i<res.data.length;i++){
- var templateDom = $("#templatePreview"+templateNo);
- var className = templateDom.attr("class");
- if (className === 'template-barcode') {
- res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1¶m="+res.data[i].matnr;
- } else {
- res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2¶m="+res.data[i].matnr;
- }
- }
- var tpl = templateDom.html();
- var template = Handlebars.compile(tpl);
- var html = template(res);
- var box = $("#box");
- box.html(html);box.show();
- box.print({mediaPrint:true});
- box.hide();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
+ var data = [];
+ var type = 1;
+ for (var i = 0; i<printContent.length; i ++) {
+ if (printContent[i] != null && printContent[i] !== '') {
+ var barcodeUrl;
+ if (type === 1) {
+ barcodeUrl = baseUrl+"/mac/code/auth?type="+type+"¶m="+printContent[i]+"&width="+200+"&height="+70;
+ } else {
+ barcodeUrl = baseUrl+"/mac/code/auth?type="+type+"¶m="+printContent[i]+"&width="+400+"&height="+180;
}
+ data.push({
+ item: printContent[i],
+ barcodeUrl: barcodeUrl
+ })
}
- })
+ }
+ var templateDom = $("#templatePreview"+templateNo);
+ var tpl = templateDom.html();
+ var template = Handlebars.compile(tpl);
+ var html = template({data: data});
+ var box = $("#box");
+ box.html(html);
+ box.show();
+ box.print({mediaPrint:true});
+ box.hide();
});
// 鎼滅储鏍忔悳绱簨浠�
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index ac322ac..677f08d 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -39,8 +39,8 @@
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
- ,{field: 'color', align: 'center',title: '閿�鍞鍗曞彿'}
- ,{field: 'origin', align: 'center',title: '閿�鍞鍗曡鍙�'}
+ ,{field: 'threeCode', align: 'center',title: '閿�鍞鍗曞彿'}
+ ,{field: 'deadTime', align: 'center',title: '閿�鍞鍗曡鍙�'}
// ,{field: 'name', align: 'center',title: '鍚嶇О'}
// ,{field: 'model', align: 'center',title: '閫氱敤鍨嬪彿'}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
diff --git a/src/main/webapp/views/nodeLoc/nodeLoc.html b/src/main/webapp/views/nodeLoc/nodeLoc.html
index 3b14a5c..0fa9012 100644
--- a/src/main/webapp/views/nodeLoc/nodeLoc.html
+++ b/src/main/webapp/views/nodeLoc/nodeLoc.html
@@ -114,6 +114,7 @@
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-sm" id="btn-print-batch" lay-event="printBatch">鎵归噺鎵撳嵃</button>
<!-- 鍟嗗搧/鐗╂枡 鏁版嵁涓績 -->
<!-- <div class="dropdown-menu" style="float: right">-->
<!-- <button class="layui-btn layui-btn-primary layui-border-black icon-btn layui-btn-sm"> 鏁版嵁鍚屾 <i class="layui-icon layui-icon-drop"></i></button>-->
@@ -146,122 +147,14 @@
<script type="text/javascript" src="../../static/js/nodeLoc/nodeLoc.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/nodeLoc/nodeLocTree.js" charset="utf-8"></script>
-<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="editDialog">
- <form id="detail" 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="tagSel" 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="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="weight" 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="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="length" placeholder="璇疯緭鍏ュ崟绠辨瘺閲�" class="layui-input">
- </div>
- </div>
-
- <div class="layui-form-item">
- <label class="layui-form-label">鍗曠浣撶Н</label>
- <div class="layui-input-block">
- <input name="threeCode" placeholder="璇疯緭鍏ョ瀛愬昂瀵�" class="layui-input">
- </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">
<hr>
<!--鍗曢�夋-->
<div class="layui-form-item" style="display: inline-block; margin-bottom: 10px">
- <input type="radio" name="selectTemplate" value="1" title="妯℃澘涓�" lay-filter="selectTemplateRadio" checked="">
+ <input type="radio" name="selectTemplate" value="1" title="妯℃澘涓�" lay-filter="selectTemplateRadio" checked="checked">
<input type="radio" name="selectTemplate" value="2" title="妯℃澘浜�" lay-filter="selectTemplateRadio">
- <input type="radio" name="selectTemplate" value="3" title="妯℃澘涓�" lay-filter="selectTemplateRadio">
</div>
<fieldset class="layui-elem-field site-demo-button" style="margin-top: 30px;text-align: left;">
<legend>鎵撳嵃棰勮</legend>
@@ -270,62 +163,27 @@
<!-- 棰勮鍥� 1 -->
<div id="template-preview-1" class="template-preview" style="display: inline-block">
<table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
- <tr style="height: 74px">
- <td colspan="3" align="center" scope="col">鍟嗗搧缂栫爜</td>
- <td class="barcode" colspan="9" align="center" scope="col">
+ <tr style="height: 74px; border: none">
+ <td class="barcode" colspan="12" align="center" scope="col" style=" border: none">
<img class="template-code template-barcode" src="" width="90%;">
<div style="letter-spacing: 2px;margin-top: 1px; text-align: center;">
<span>xxxxxx</span>
</div>
</td>
</tr>
- <tr style="height: 74px">
- <td align="center" colspan="3">鍟嗗搧</td>
- <td align="center" colspan="5">xxxxxx-xx/xx</td>
- <td align="center" colspan="2">澶囨敞</td>
- <td align="center" colspan="2">xx</td>
- </tr>
</table>
</div>
<!-- 棰勮鍥� 2 -->
<div id="template-preview-2" class="template-preview" style="display: none">
- <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
- <tr style="height: 30px">
- <td align="center" width="20%">鍟嗗搧</td>
- <td align="center" width="80%" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
- </tr>
- <tr style="height: 30px">
- <td align="center" width="20%">澶囨敞</td>
- <td align="center" width="80%">xxxxxxxx</td>
- </tr>
- <tr style="height: 75px;">
- <td align="center" colspan="2" width="100%" style="border: none">
- <img class="template-code template-barcode" src="" width="80%">
- <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
+ <table class="contain" width="280" style="overflow: hidden;table-layout: fixed; border: none; font-size: xx-large">
+ <tr style="height: 74px">
+ <td class="barcode" colspan="9" align="center" scope="col" style="border: none">
+ <img class="template-code template-barcode" src="" width="90%;"> 鈫�
+ <div style="letter-spacing: 2px;margin-top: 1px; text-align: center; font-size: xx-small">
<span>xxxxxx</span>
</div>
</td>
- </tr>
- </table>
- </div>
-
- <!-- 棰勮鍥� 3 -->
- <div id="template-preview-3" class="template-preview" style="display: none">
- <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
- <tr style="height: 74px">
- <td align="center" scope="col" colspan="1">鍟嗗搧</td>
- <td align="center" scope="col" colspan="1" style="">xxxxxx-xx/xx</td>
- <td align="center" scope="col" colspan="2" rowspan="2">
- <img class="template-code template-qrcode" src="" width="80%">
- <div style="letter-spacing: 1px;margin-top: 1px; text-align: center">
- <span>xxxxxx</span>
- </div>
- </td>
- </tr>
- <tr style="height: 74px">
- <td align="center" colspan="1">澶囨敞</td>
- <td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
</tr>
</table>
</div>
@@ -348,21 +206,14 @@
<!-- 妯℃澘1 -->
<script type="text/template" id="templatePreview1" class="template-barcode">
{{#each data}}
- <table class="contain" width="280" style="overflow: hidden;font-size: small;table-layout: fixed;">
- <tr style="height: 74px">
- <td align="center" colspan="3" scope="col">鍟嗗搧缂栫爜</td>
- <td align="center" class="barcode" colspan="9" scope="col">
- <img class="template-code" src="{{this.barcodeUrl}}" width="90%">
- <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
- <span>{{this.matnr}}</span>
+ <table class="contain" width="400px" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
+ <tr style="height: 150px; border: none">
+ <td class="barcode" colspan="12" align="center" scope="col" style=" border: none">
+ <img class="template-code template-barcode" src="{{this.barcodeUrl}}" width="90%;">
+ <div style="letter-spacing: 2px;margin-top: 1px; text-align: center;">
+ <span>{{this.item}}</span>
</div>
</td>
- </tr>
- <tr style="height: 74px">
- <td align="center" colspan="3">鍟嗗搧</td>
- <td align="center" colspan="5" style="overflow: hidden; white-space: nowrap;text-overflow: ellipsis;">{{this.maktx}}</td>
- <td align="center" colspan="2">澶囨敞</td>
- <td align="center" colspan="2">{{this.memo}}</td>
</tr>
</table>
{{/each}}
@@ -370,56 +221,14 @@
<!-- 妯℃澘2 -->
<script type="text/template" id="templatePreview2" class="template-barcode">
{{#each data}}
- <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
- <tr style="height: 35px">
- <td align="center" width="20%">鍟嗗搧</td>
- <td align="center" width="80%" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.maktx}}</td>
- </tr>
- <tr style="height: 35px">
- <td align="center" width="20%">澶囨敞</td>
- <td align="center" width="80%">{{this.memo}}</td>
- </tr>
- <tr style="height: 79px;">
- <td align="center" colspan="2" width="100%" style="border: none">
- <img class="template-code" src="{{this.barcodeUrl}}" width="80%">
- <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
- <span>{{this.matnr}}</span>
+ <table class="contain" width="400px" style="overflow: hidden;table-layout: fixed; border: none; font-size: xx-large">
+ <tr style="height: 150px">
+ <td class="barcode" colspan="9" align="center" scope="col" style="border: none">
+ <img class="template-code template-barcode" src="{{this.barcodeUrl}}" width="90%;"> 鈫�
+ <div style="letter-spacing: 2px;margin-top: 1px; text-align: center; font-size: xx-small">
+ <span>{{this.item}}</span>
</div>
</td>
- </tr>
- </table>
- {{/each}}
-</script>
-<!-- 妯℃澘3 -->
-<script type="text/template" id="templatePreview3" class="template-qrcode">
- {{#each data}}
- <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
- <tr style="height: 74px" >
- <td align="center" scope="col" colspan="1">鍟嗗搧</td>
- <td align="center" scope="col" colspan="1" style="
- display: inline-block;
- line-height: 20px;
- vertical-align: middle;
- border: none;
- border-top: 1px solid #000;
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 3;
- -webkit-box-orient: vertical;
- ">
- {{this.maktx}}
- </td>
- <td align="center" scope="col" colspan="2" rowspan="2">
- <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="80%">
- <div style="letter-spacing: 1px;margin-top: 1px; text-align: center">
- <span>{{this.matnr}}</span>
- </div>
- </td>
- </tr>
- <tr style="height: 74px">
- <td align="center" colspan="1">澶囨敞</td>
- <td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.memo}}</td>
</tr>
</table>
{{/each}}
--
Gitblit v1.9.1