From eaa41fed2f107ce160e899bbc2900bb19124d736 Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期六, 03 二月 2024 17:18:48 +0800
Subject: [PATCH] 补打标签功能开发
---
HTML/views/ASNSetting/LabelBoxBuDa.html | 338 ++++++++++++++
Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs | 565 ++++++++++++++++++++++++
Wms/Wms/Controllers/BllAsnController.cs | 28 +
Wms/Model/ModelVm/BllAsnVm/BoxInfoVm.cs | 13
HTML/views/ASNSetting/LabelPrint.html | 57 --
Wms/WMS.IBLL/IBllAsnServer/IBllBoxInfoServer.cs | 13
HTML/views/ASNSetting/LabelBox.html | 315 ++-----------
7 files changed, 1,017 insertions(+), 312 deletions(-)
diff --git a/HTML/views/ASNSetting/LabelBox.html b/HTML/views/ASNSetting/LabelBox.html
index 5800979..79afd1a 100644
--- a/HTML/views/ASNSetting/LabelBox.html
+++ b/HTML/views/ASNSetting/LabelBox.html
@@ -120,13 +120,13 @@
lay-filter="LAY-app-contlist-search">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
</button>
+ <button class="layui-btn layui-btn-sm layuiadmin-btn-list buDaLabelClass" style="margin-left: 5px;" lay-event="BuDaLabel" id="BuDaLabel">
+ <i class="layui-icon layui-icon-print layuiadmin-button-btn"></i>琛ユ墦鏍囩
+ </button>
</div>
</div>
</div>
- <div class="layui-card-body">
- <!-- <button type="button" class="layui-btn layui-btn-sm" id="daoru1">
- 瀵煎叆
- </button> -->
+ <div class="layui-card-body">
<div class="position-relative">
<table id="Box-list" lay-filter="Box-list"></table>
@@ -277,68 +277,54 @@
// 椤甸潰鍔犺浇缁戝畾Table
bindTable();
-
- // 娣诲姞瀵煎叆鎸夐挳鍗曟満浜嬩欢
- table.on('toolbar(Box-list)', function (obj) {
- switch (obj.event) {
- case 'add': // 娣诲姞绠辨敮鍏崇郴
- // layer.open({
- // type: 2,
- // title: '鑷畾涔夊垪',
- // content: '../SystemSettings/HeaderSetting.html',
- // maxmin: false,
- // resize: false,
- // area: ['970px', '650px']
- // });
- layer.open({
- type: 2,
- title: '鎵撳嵃',
- content: 'LabelPrint.html?',
- maxmin: true,
- area: ['600px', '670px'],
- btn: ['鍙栨秷']
- });
- break;
-
- default: break;
- }
- });
+ //鐢熸垚
+ $('#BuDaLabel').on('click', function () {
+ layer.open({
+ type: 2,
+ title: '鎵撳嵃',
+ content: 'LabelBoxBuDa.html',
+ maxmin: true,
+ area: ['430px', '390px'],
+ // btn: ['鍙栨秷']
+ });
+ });
+
- // 鍒犻櫎绠辨敮淇℃伅
- table.on('tool(Box-list)', function (obj) {
- var data = obj.data;
- switch (obj.event) {
- case "del":
- layer.confirm('纭畾鍒犻櫎绠辨敮鏄庣粏鍚楋紵', function (index) {
- // 浠ｇ爜鍖哄煙
- var param = {
- Id: data.Id,
- Status: "0",
- };
- console.log(param);
- sendData(IP + "/BllAsn/DelBllBoxInfo", param, 'post', function (res) {
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- bindTable();
- doing = true
- });
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { doing = true });
- }
- });
- });
+ // // 鍒犻櫎绠辨敮淇℃伅
+ // table.on('tool(Box-list)', function (obj) {
+ // var data = obj.data;
+ // switch (obj.event) {
+ // case "del":
+ // layer.confirm('纭畾鍒犻櫎绠辨敮鏄庣粏鍚楋紵', function (index) {
+ // // 浠ｇ爜鍖哄煙
+ // var param = {
+ // Id: data.Id,
+ // Status: "0",
+ // };
+ // console.log(param);
+ // sendData(IP + "/BllAsn/DelBllBoxInfo", param, 'post', function (res) {
+ // if (res.code == 0) { //鎴愬姛
+ // layer.msg(res.msg, {
+ // icon: 1,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // }, function () {
+ // bindTable();
+ // doing = true
+ // });
+ // } else { //涓嶆垚鍔�
+ // layer.msg(res.msg, {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // }, function () { doing = true });
+ // }
+ // });
+ // });
- break;
- default: break;
- }
- });
+ // break;
+ // default: break;
+ // }
+ // });
//#region 浜嬩欢鏂规硶
// 鏌ヨ褰曞叆鐨勭鏀叧绯�
@@ -426,39 +412,6 @@
},
cols: colsJson
});
-
- //缁戝畾瀵煎叆
- upload.render({
- elem: '#daoru' //缁戝畾鍏冪礌
- , url: '' //涓婁紶鎺ュ彛
- , auto: false //鏄惁閫夊畬鏂囦欢鍚庤嚜鍔ㄤ笂浼犮�傚鏋滆瀹� false锛岄偅涔堥渶瑕佽缃� bindAction 鍙傛暟鏉ユ寚鍚戜竴涓叾瀹冩寜閽彁浜や笂浼�
- , exts: 'slx|excel|xlsx' //鍏佽涓婁紶鐨勬枃浠跺悗缂�
- , accept: 'file' //鎸囧畾鍏佽涓婁紶鏃舵牎楠岀殑鏂囦欢绫诲瀷
- //, bindAction: '#daoru' //鎸囧悜涓�涓寜閽Е鍙戜笂浼�
- , choose: function (obj) {// 閫夋嫨鏂囦欢鍥炶皟
- console.log(obj);
- var files = obj.pushFile(); //灏嗘瘡娆￠�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
- var fileArr = Object.values(files);// 娉ㄦ剰杩欓噷鐨勬暟鎹渶瑕佹槸鏁扮粍锛屾墍浠ラ渶瑕佽浆鎹竴涓�
- console.log(fileArr)
- // 鐢ㄥ畬灏辨竻鐞嗘帀锛岄伩鍏嶅娆￠�変腑鐩稿悓鏂囦欢鏃跺嚭鐜伴棶棰�
- for (var index in files) {
- console.log(index);
- if (files.hasOwnProperty(index)) {
- delete files[index];
- }
- }
- console.log("abs");
- uploadExcel(fileArr); // 濡傛灉鍙渶瑕佹渶鏂伴�夋嫨鐨勬枃浠讹紝鍙互杩欐牱鍐欙細 uploadExcel([files.pop()])
- }
- , done: function (res) {
- console.log(res);
- //涓婁紶瀹屾瘯鍥炶皟
- }
- , error: function (res) {
- console.log(res);
- //璇锋眰寮傚父鍥炶皟
- }
- });
});
//#endregion
}
@@ -466,28 +419,16 @@
// 鏉冮檺璁剧疆
function setRight() {
$(function () {
- $(".addClass").hide();
- $(".DaoRuClass").hide();
- $(".delClass").hide();
+ $(".buDaLabelClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
- if (res.data[k].MenuName == "娣诲姞绠辨敮褰曞叆") {
+ if (res.data[k].MenuName == "琛ユ墦鏍囩") {
$(function () {
- $(".addClass").show();
+ $(".buDaLabelClass").show();
});
- }
- if (res.data[k].MenuName == "瀵煎叆绠辨敮褰曞叆") {
- $(function () {
- $(".DaoRuClass").show();
- });
- }
- if (res.data[k].MenuName == "鍒犻櫎绠辨敮褰曞叆") {
- $(function () {
- $(".delClass").show();
- });
- }
+ }
}
} else { //涓嶆垚鍔�
layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
@@ -498,155 +439,7 @@
});
}
- // 鑾峰彇绠辨敮淇℃伅
- function getBoxInforVlues() {
- var msg = "";
- if ($("#BoxNo").val() == "") {
- layer.msg("璇疯緭鍏ョ鐮侊紒", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return msg;
- }
- if ($("#BoxNo3").val() == "") {
- layer.msg("璇疯緭鍏ユ敮鐮侊紒", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return msg;
- }
- if ($("#SkuNo").val() == "") {
- layer.msg("璇疯緭鍏ョ墿鏂欑紪鐮侊紒", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return msg;
- }
- if ($("#LotNo").val() == "") {
- layer.msg("璇疯緭鍏ユ壒娆″彿锛�", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return msg;
- }
- if ($("#Qty").val() == "") {
- layer.msg("璇疯緭鍏ュ疄闄呮暟閲忥紒", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return msg;
- }
-
- var param = {
- BoxNo: $("#BoxNo").val(),
- BoxNo3: $("#BoxNo3").val(),
- SkuNo: $("#SkuNo").val(),
- LotNo: $("#LotNo").val(),
- LotText: $("#LotText").val(),
- Qty: parseInt($("#Qty").val()),
- ProductionTime: $("#ProductionTime").val(),
- InspectMark: $("#InspectMark").val(),
- BitBoxMark: $("#BitBoxMark").val(),
- Origin: "褰曞叆",
- };
-
- return param;
- }
-
- // 瀵煎叆绠辨敮鍏崇郴
- function uploadExcel(files) {
- console.log("123");
- var list = [];
- try {
- var excel = layui.excel;
- excel.importExcel(files, {
- // 璇诲彇鏁版嵁鐨勫悓鏃舵⒊鐞嗘暟鎹�
- fields: {
- 'BoxNo': 'A', //绠卞彿
- 'BoxNo2': 'B', //鐩掑彿
- 'BoxNo3': 'C', //鏀彿
- 'Qty': 'D', //鏁伴噺
- 'SkuNo': 'E', //鐗╂枡鍙�
- 'LotNo': 'F', //鎵规
- 'LotText': 'G', //鎵规鎻忚堪
- 'ProductionTime': 'H', //鐢熶骇鏃ユ湡
- 'InspectMark': 'I', //妫�楠屾爣璁�
- 'BitBoxMark': 'J', //闆剁鏍囪
- }
- },
- function (data) {
- console.log(data);
- // var arr = new Array();
- //excel绗竴琛屼笉璇诲彇銆佽缃负鏍囬
- for (i = 1; i < data[0].Sheet1.length; i++) {
-
- var Qty = 0;
- if (isIntNum(data[0].Sheet1[i].Qty)) {
- Qty = parseInt(data[0].Sheet1[i].Qty);
- }
-
- var InspectMark = "0";
- var BitBoxMark = "0";
- if (data[0].Sheet1[i].InspectMark == "鏄�") {
- InspectMark = "1";
- }
- if (data[0].Sheet1[i].BitBoxMark == "鏄�") {
- BitBoxMark = "1";
- }
- var tt = {
- BoxNo: data[0].Sheet1[i].BoxNo,
- BoxNo2: data[0].Sheet1[i].BoxNo2,
- BoxNo3: data[0].Sheet1[i].BoxNo3,
- Qty: Qty,
- SkuNo: data[0].Sheet1[i].SkuNo,
- LotNo: data[0].Sheet1[i].LotNo,
- LotText: data[0].Sheet1[i].LotText,
- ProductionTime: data[0].Sheet1[i].ProductionTime,
- InspectMark: InspectMark,
- BitBoxMark: BitBoxMark,
- };
- list.push(tt);
- console.log(data[0].Sheet1[i].ProductionTime);
- }
- console.log(list);
- var param = {
- "OperType": "Add",
- "ListBoxInfo": list,
- }
- console.log(param)
- layer.load();//鎵撳紑loading
- sendData(IP + "/BllAsn/ImportBllBoxInfo", param, 'post', function (res) {
- layer.closeAll(); //鍏抽棴loading
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- bindTable();
- doing = true
- });
- } else { //涓嶆垚鍔�
- if (res.msg == undefined) {
- layer.msg("鍚庡彴姝ｅ湪瀵煎叆涓紝璇风◢鍚庢煡鐪嬬粨鏋�", {
- icon: 2,
- time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { bindTable(); doing = true });
- } else {
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { bindTable(); doing = true });
- }
- }
- });
- });
- } catch (e) {
- layer.alert(e.message);
- }
-
- }
- //#endregion
-
+
//#region 鑷畾涔夎〃澶�
//鑷畾涔夎〃澶�
active = {
diff --git a/HTML/views/ASNSetting/LabelBoxBuDa.html b/HTML/views/ASNSetting/LabelBoxBuDa.html
new file mode 100644
index 0000000..b835742
--- /dev/null
+++ b/HTML/views/ASNSetting/LabelBoxBuDa.html
@@ -0,0 +1,338 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta charset="utf-8">
+ <title>鏍囩鎵撳嵃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <style media="print">
+ @page {
+ size: auto;
+ margin: 0 0 0 20px;
+ }
+
+ .layui-input {
+ padding-left: 0px;
+ }
+
+ .layui-form-item {
+ margin-bottom: 2px;
+ }
+ </style>
+ <style>
+ .layui-form-item .layui-input-inline {
+ display: block;
+ float: none;
+ left: -3px;
+ width: auto;
+ margin: 0 0 10px 90px;
+ }
+
+ .hideCls {
+ display: none;
+ }
+
+ .showCls {
+ display: block;
+ }
+ </style>
+</head>
+
+<body>
+ <div style="width:100%;">
+ <div class="layui-form hideCls" lay-filter="layuiadmin-app-form-list" id="print"
+ style="width: 100%;height:100%; text-align: right;padding-top: 5px;margin-left: 0%;">
+ <div>
+ <table border="1" id="table" style="width: 90%; height:480px; margin: 0 auto; text-align: center;border-collapse: collapse;table-layout: fixed;">
+
+ <tr>
+ <td colspan="2">
+ <img src="../../img/LiNuo.jpg" style="width: 90%; height: 30px;" />
+ </td>
+ <td colspan="2" style="padding: 1px 0px;">SMP-ST002-R08-01</td>
+ </tr>
+ <tr>
+ <td colspan="4">鐗╂枡鏍囩</td>
+ </tr>
+ <tr>
+ <td>鍝佸悕</td>
+ <td colspan="3" id="SkuName"></td>
+ </tr>
+ <tr>
+ <td>瑙勬牸/鍨嬪彿</td>
+ <td id="Standard"></td>
+ <td>鍖呰瑙勬牸</td>
+ <td id="PackageStandard"></td>
+ </tr>
+ <tr>
+ <td>杩涘巶缂栧彿</td>
+ <td id="LotNo"></td>
+ <td>鐗╂枡浠ｇ爜</td>
+ <td id="SkuNo"></td>
+ </tr>
+ <tr>
+ <td>鍘熷巶鎵瑰彿</td>
+ <td id="SupplierLot"></td>
+ <td>鏁� 閲�</td>
+ <td id="Qty"></td>
+ </tr>
+ <tr>
+ <td>鏈夋晥鏈熻嚦</td>
+ <td id="ExpirationTime"></td>
+ <td>鍌ㄥ瓨鏈熻嚦</td>
+ <td id="StoreTime"></td>
+ </tr>
+ <tr>
+ <td colspan="4">
+ <img id="imgBar" style="width: auto; height: auto;" />
+ </td>
+ </tr>
+
+ </table>
+ </div>
+ <div style="page-break-after: always;"></div>
+ </div>
+ <div class="layui-form hideCls" lay-filter="layuiadmin-app-form-list" id="print2"
+ style="width: 100%;height:100%; text-align: right;padding-top: 5px;margin-left: 0%;"></div>
+
+ <div class="layui-form" style="padding: 30px 15px 0px; " id="button">
+ <div class="layui-form-item" style="margin-bottom:0px;">
+ <label class="layui-form-label" style="width: 60px;">璧峰绠辩爜</label>
+ <div class="layui-input-inline">
+ <input type="text" id="LabelStream" name="LabelStream" placeholder="璧峰绠辩爜" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item" style="margin-bottom:0px;">
+ <label class="layui-form-label" style="width: 60px;">缁撳熬绠辩爜</label>
+ <div class="layui-input-inline">
+ <input type="text" id="EndBoxCode" name="EndBoxCode" placeholder="缁撳熬绠辩爜" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+
+ <div class="layui-form-item" style="margin-bottom:0px;">
+ <label class="layui-form-label" style="width: 60px;">璧峰鏀爜</label>
+ <div class="layui-input-inline">
+ <input type="text" id="LabelStream2" name="LabelStream2" placeholder="璧峰鏀爜" autocomplete="off"
+ class="layui-input" readonly>
+ </div>
+ </div>
+
+ <div class="layui-form-item" style="margin-bottom:0px;">
+ <label class="layui-form-label" style="width: 60px;">缁撳熬鏀爜</label>
+ <div class="layui-input-inline">
+ <input type="text" id="EndBoxCode2" name="EndBoxCode2" placeholder="缁撳熬鏀爜" autocomplete="off"
+ class="layui-input" readonly>
+ </div>
+ </div>
+
+ <div class="layui-form-item" style="margin-bottom:0px;">
+ <label class="layui-form-label" style="width: 60px;">琛ユ墦绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="Type" id="Type" lay-search lay-filter="Type">
+ <option value="1">绠�</option>
+ <option value="2">鏀�</option>
+ <option value="3">鍚岀鍐呯鏀�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item" style="margin-bottom:0px; text-align: center;">
+
+ <button id="btnPrint" class="layui-btn layui-btn-sm" lay-event="Add"><i
+ class="layui-icon"></i>鎵撳嵃</button>
+ </div>
+ </div>
+ </div>
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script src="../../js/public.js"></script>
+ <script src="../../js/jquery-3.5.1.min.js"></script>
+ <script src="../../js/jquery.cookie.js"></script>
+ <script src="../../js/jquery.print.js"></script>
+ <script>
+ var boxcode = "";
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'layer', 'laydate'], function () {
+
+ var $ = layui.$,
+ form = layui.form,
+ layer = layui.layer;
+ var laydate = layui.laydate;
+ var indes = layer.index;
+ laydate.render({
+ elem: '#ProductionDate'
+ , format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
+ });
+ laydate.render({
+ elem: '#InspectTime'
+ , format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
+ });
+ laydate.render({
+ elem: '#ExpirationTime'
+ , format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
+ });
+ var xun = 0;
+
+ $('#btnPrint').on('click', function () {
+
+ GetImportId();
+ });
+ form.on('select(Type)', function (data) {
+ console.log(data.value); //寰楀埌琚�変腑鐨勫��
+ if (data.value == "1") {
+ $("#LabelStream").removeAttr("readonly")
+ $("#EndBoxCode").removeAttr("readonly")
+
+ $("#LabelStream2").attr("readonly", "readonly")
+ $("#EndBoxCode2").attr("readonly", "readonly")
+
+ } else if (data.value == "2") {
+ $("#LabelStream").attr("readonly", "readonly")
+ $("#EndBoxCode").attr("readonly", "readonly")
+
+ $("#LabelStream2").removeAttr("readonly")
+ $("#EndBoxCode2").removeAttr("readonly")
+
+ } else if (data.value == "3") {
+ $("#LabelStream").removeAttr("readonly")
+ $("#EndBoxCode").attr("readonly", "readonly")
+
+ $("#LabelStream2").removeAttr("readonly")
+ $("#EndBoxCode2").removeAttr("readonly")
+ }
+ });
+ // 鏍囩鍙橀噺璧嬪��
+ function GetImportId() {
+ var param1 = {
+ BoxNo: $("#LabelStream").val(),
+ EndBoxNo: $("#EndBoxCode").val(),
+ BoxNo2: $("#LabelStream2").val(),
+ EndBoxNo2: $("#EndBoxCode2").val(),
+ Type: $("#Type").val(),
+ };
+
+ synData(IP + "/BllAsn/GetBuDaLabelList", param1, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ var labels = "";
+ console.log(res.data);
+ for (var z = 0; z < res.data.length; z++) {
+ var idd = "";
+ if (z - 1 >= 0) {
+ idd = (z - 1).toString();
+ }
+ console.log(res.data[z]);
+ console.log(z);
+ $("#SkuNo").attr("id", "SkuNo" + z.toString());
+ $("#SkuNo" + z.toString()).html(res.data[z].SkuNo);
+
+ $("#SkuName").attr("id", "SkuName" + z.toString());
+ $("#SkuName" + z.toString()).html( res.data[z].SkuName);
+
+
+ $("#PackageStandard").attr("id", "PackageStandard" + z.toString());
+ $("#PackageStandard" + z.toString()).html(res.data[z].PackageStandard);
+
+ $("#Standard").attr("id", "Standard" + z.toString());
+ $("#Standard" + z.toString()).html(res.data[z].Standard);
+
+ $("#Qty").attr("id", "Qty" + z.toString());
+ $("#Qty" + z.toString()).html( res.data[z].Qty);
+
+ $("#SupplierLot").attr("id", "SupplierLot" + z.toString());
+ $("#SupplierLot" + z.toString()).html( res.data[z].SupplierLot);
+
+ $("#LotNo").attr("id", "LotNo" + z.toString());
+ $("#LotNo" + z.toString()).html( res.data[z].LotNo);
+
+ $("#SupplierLot").attr("id", "SupplierLot" + z.toString());
+ $("#SupplierLot" + z.toString()).html( res.data[z].SupplierLot);
+
+ $("#ExpirationTime").attr("id", "ExpirationTime" + z.toString());
+ $("#ExpirationTime" + z.toString()).html( res.data[z].ExpirationTime);
+
+
+ $("#StoreTime").attr("id", "StoreTime" + z.toString());
+ $("#StoreTime" + z.toString()).html( res.data[z].StoreTime);
+
+ $("#imgBar").attr("id", "imgBar" + z.toString());
+ $("#imgBar" + z.toString()).attr("src", res.data[z].ImgStr);
+
+
+ // console.log("#SkuNo"+z.toString());
+ labels += $("#print").html();
+ //console.log(labels);
+ $("#SkuNo" + z.toString()).attr("id", "SkuNo");
+ $("#SkuNo").html("");
+
+ $("#SkuName" + z.toString()).attr("id", "SkuName");
+ $("#SkuName").html("");
+
+ $("#PackageStandard" + z.toString()).attr("id", "PackageStandard");
+ $("#PackageStandard").html("");
+
+ $("#Qty" + z.toString()).attr("id", "Qty");
+ $("#Qty").html("");
+
+ $("#Standard" + z.toString()).attr("id", "Standard");
+ $("#Standard").html("");
+
+ $("#LotNo" + z.toString()).attr("id", "LotNo");
+ $("#LotNo").html("");
+
+ $("#SupplierLot" + z.toString()).attr("id", "SupplierLot");
+ $("#SupplierLot").html("");
+
+ $("#StoreTime" + z.toString()).attr("id", "StoreTime");
+ $("#StoreTime").html("");
+
+ $("#ExpirationTime" + z.toString()).attr("id", "ExpirationTime");
+ $("#ExpirationTime").html("");
+
+ $("#imgBar" + z.toString()).attr("id", "imgBar");
+ $("#imgBar").attr("src", "");
+ }
+ console.log(labels);
+ document.getElementById('print2').innerHTML = "";
+ document.getElementById('print2').innerHTML = labels;
+ $("#print2").removeClass("hideCls");
+ $("#button").hide();
+ $("#print2").print();
+ $("#button").show();
+ $("#print2").addClass("hideCls");
+
+ $("#LabelStream").val("");
+ $("#EndBoxCode").val("");
+ $("#LabelStream2").val("");
+ $("#EndBoxCode2").val("");
+
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+ };
+
+ // 鑾峰彇浼犻�掑弬鏁�
+ function getQueryString(name) {
+ var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+ var r = window.location.search.substr(1).match(reg);
+ if (r != null) return unescape(r[2]);
+ return null;
+ }
+ })
+
+ </script>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/HTML/views/ASNSetting/LabelPrint.html b/HTML/views/ASNSetting/LabelPrint.html
index 0dc83e6..a12a469 100644
--- a/HTML/views/ASNSetting/LabelPrint.html
+++ b/HTML/views/ASNSetting/LabelPrint.html
@@ -157,44 +157,7 @@
var param = {
ImportId: id,
};
- if ($("#ProductionDate").val() == "" || $("#ProductionDate").val() == undefined || $("#ProductionDate").val() == null) {
- layer.msg("鐢熶骇鏃ユ湡涓嶈兘涓虹┖", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { return; });
- }
- if ($("#SupplierName").val() == "" || $("#SupplierName").val() == undefined || $("#SupplierName").val() == null) {
- layer.msg("鐢熶骇鍘傚涓嶈兘涓虹┖", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { return; });
- }
- if ($("#SupplierLot").val() == "" || $("#SupplierLot").val() == undefined || $("#SupplierLot").val() == null) {
- console.log($("#SupplierLot").val())
- layer.msg("鍘傚鎵瑰彿涓嶈兘涓虹┖", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { return; });
- }
-
- if ($('#number').val() > 0) {
-
- if ($('#bQNum').val() > 0) {
- div($('#number').val(), $('input[name="isprint"]:checked').val(), $('#bQNum').val());
- } else {
- div($('#number').val(), $('input[name="isprint"]:checked').val(), 0);
- }
-
- }
- else {
-
- if ($('#bQNum').val() >= 0) {
- div(0, $('input[name="isprint"]:checked').val(), $('#bQNum').val());
- } else {
- div(0, $('input[name="isprint"]:checked').val(), 0);
- }
-
- }
+
});
if (!id) {
@@ -222,20 +185,13 @@
}, function () { });
}
});
-
- // div(-1, 1, 0);
+
}
-
// 寰幆鍔犺浇鏍囩
- function div(number, isprint, bqNum) {
- GetImportId(number, isprint, bqNum);
- }
-
- // 鏍囩鍙橀噺璧嬪��
- function GetImportId(i, isprint, bqNum) {
-
+ function div(i, isprint, bqNum) {
+
var param1 = {
isprint: isprint,
ImportId: id,
@@ -350,9 +306,8 @@
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function () { });
}
- });
- };
-
+ });
+ }
// 鑾峰彇浼犻�掑弬鏁�
function getQueryString(name) {
var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
diff --git a/Wms/Model/ModelVm/BllAsnVm/BoxInfoVm.cs b/Wms/Model/ModelVm/BllAsnVm/BoxInfoVm.cs
index aa41732..5a4a667 100644
--- a/Wms/Model/ModelVm/BllAsnVm/BoxInfoVm.cs
+++ b/Wms/Model/ModelVm/BllAsnVm/BoxInfoVm.cs
@@ -208,4 +208,17 @@
}
+ /// <summary>
+ /// 琛ユ墦鐗╂枡鏍囩Vm
+ /// </summary>
+ public class BuDaLabelBoxVm
+ {
+ public string BoxNo { get; set; }
+ public string EndBoxNo { get; set; }
+ public string BoxNo2 { get; set; }
+ public string EndBoxNo2 { get; set; }
+ public string Type { get; set; }
+
+ }
+
}
diff --git a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
index 866b3b5..db0a3dc 100644
--- a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
@@ -966,6 +966,571 @@
}
}
+ // 琛ユ墦鏍囩
+ public List<BoxInfoDto> GetBuDaLabelList(string boxNo, string endBoxNo, string boxNo2, string endBoxNo2, string type, int userId)
+ {
+ try
+ {
+ //鎵撳嵃鏁版嵁闆嗗悎
+ var printList = new List<BoxInfoDto>();
+ List<BoxInfoDto> printModelList = new List<BoxInfoDto>();
+ //List<WmsLabelPrintLog> printlog = new List<WmsLabelPrintLog>();
+ //鏍囩琛ㄦ暟鎹俊鎭�
+ var list = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.Origin == "WMS鐢熸垚").ToList();
+
+ #region MyRegion
+
+ switch (type)
+ {
+ case "1":
+ if (string.IsNullOrWhiteSpace(endBoxNo))
+ {
+ #region 鍗曚釜绠辩爜鏍囩
+
+ if (string.IsNullOrWhiteSpace(boxNo))
+ {
+ throw new Exception($"璧峰绠辩爜涓嶈兘涓虹┖");
+ }
+ var dataList = list.Where(m => m.BoxNo == boxNo);
+ var data = list.FirstOrDefault(m => m.BoxNo == boxNo);
+ if (data == null)
+ {
+ throw new Exception($"鏈煡璇㈠埌{boxNo}淇℃伅");
+ }
+ // 鐗╂枡鏉＄爜淇℃伅璧嬪��
+ BoxInfoDto model = new BoxInfoDto();
+ model.SkuNo = data.SkuNo;
+ model.SkuName = data.SkuName;
+ model.LotNo = data.LotNo; //鎵规
+ model.SupplierLot = data.SupplierLot; // 鍘熷巶鎵瑰彿
+ model.Standard = data.Standard; // 瑙勬牸/鍨嬪彿
+ model.PackageStandard = data.PackageStandard; // 鍖呰瑙勬牸
+
+ model.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
+ model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+
+ model.Qty = dataList.Sum(m=>m.Qty);// 鏁伴噺
+
+ model.BoxNo = data.BoxNo; // 绠卞彿
+
+ model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo,100, 25);
+
+ // 娣诲姞鍒發ist闆嗗悎
+ printModelList.Add(model);
+
+ //娣诲姞鎵撳嵃璁板綍
+ //WmsLabelPrintLog log = new WmsLabelPrintLog();
+ //log.BoxCode = data.LabelStream;
+ //log.CreateTime = DateTime.Now;
+ //log.Demo = Demo;
+ //log.Isdel = 0;
+ //log.CreateUser = userId;
+ //printlog.Add(log);
+ #endregion
+ }
+ else
+ {
+ #region 澶氫釜绠辩爜鏍囩 寮�濮�-缁撴潫
+ if (string.IsNullOrWhiteSpace(boxNo))
+ {
+ throw new Exception("璧峰绠辩爜涓嶈兘涓虹┖");
+ }
+ var sql = $@"select * from BllBoxInfo where IsDel = '0' and Origin = 'WMS鐢熸垚' and BoxNo >='{boxNo}' and BoxNo <= '{endBoxNo}'";
+ var data2 = Db.Ado.SqlQuery<BllBoxInfo>(sql);
+ var data3 = data2.GroupBy(m => m.BoxNo).Select(m => m.Key).OrderBy(m => m).ToList();
+ if (data3.Count == 0)
+ {
+ throw new Exception($"鏈煡璇㈠埌{boxNo}-{endBoxNo}涓俊鎭�");
+ }
+
+ var i = 0;
+ foreach (var item in data3)
+ {
+ var data1 = data2.Where(m => m.BoxNo == item);
+ var data = data2.FirstOrDefault(m => m.BoxNo == item);
+ if (data == null)
+ {
+ throw new Exception($"鏈煡璇㈠埌{item}淇℃伅");
+ }
+ // 鐗╂枡鏉＄爜淇℃伅璧嬪��
+ BoxInfoDto model = new BoxInfoDto();
+ model.SkuNo = data.SkuNo;
+ model.SkuName = data.SkuName;
+ model.LotNo = data.LotNo; //鎵规
+ model.SupplierLot = data.SupplierLot; // 鍘熷巶鎵瑰彿
+ model.Standard = data.Standard; // 瑙勬牸/鍨嬪彿
+ model.PackageStandard = data.PackageStandard; // 鍖呰瑙勬牸
+
+ model.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
+ model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+
+ model.Qty = data1.Sum(m => m.Qty);// 鏁伴噺
+
+ model.BoxNo = data.BoxNo; // 绠卞彿
+
+ model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 100, 25);
+
+ // 娣诲姞鍒發ist闆嗗悎
+ printModelList.Add(model);
+ i++;
+ ////娣诲姞鎵撳嵃璁板綍
+ //WmsLabelPrintLog log = new WmsLabelPrintLog();
+ //log.BoxCode = data.LabelStream;
+ //log.CreateTime = DateTime.Now;
+ //log.Demo = Demo;
+ //log.Isdel = 0;
+ //log.CreateUser = userId;
+ //printlog.Add(log);
+ if (i >= 100)
+ {
+ break;
+ }
+ }
+
+ #endregion
+ }
+ break;
+ case "2":
+ if (string.IsNullOrWhiteSpace(endBoxNo2))
+ {
+ #region 鍗曚釜鏀爜鏍囩
+
+ if (string.IsNullOrWhiteSpace(boxNo2))
+ {
+ throw new Exception($"璧峰鏀爜涓嶈兘涓虹┖");
+ }
+ var data = list.FirstOrDefault(m => m.BoxNo3 == boxNo2);
+ if (data == null)
+ {
+ throw new Exception($"鏈煡璇㈠埌{boxNo2}淇℃伅");
+ }
+ // 鐗╂枡鏉＄爜淇℃伅璧嬪��
+ BoxInfoDto model = new BoxInfoDto();
+ model.SkuNo = data.SkuNo;
+ model.SkuName = data.SkuName;
+ model.LotNo = data.LotNo; //鎵规
+ model.SupplierLot = data.SupplierLot; // 鍘熷巶鎵瑰彿
+ model.Standard = data.Standard; // 瑙勬牸/鍨嬪彿
+ model.PackageStandard = data.PackageStandard; // 鍖呰瑙勬牸
+
+ model.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
+ model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+
+ model.Qty = data.Qty;// 鏁伴噺
+
+ model.BoxNo = data.BoxNo3; // 鏀彿
+
+ model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 100, 25);
+
+ // 娣诲姞鍒發ist闆嗗悎
+ printModelList.Add(model);
+
+ ////娣诲姞鎵撳嵃璁板綍
+ //WmsLabelPrintLog log = new WmsLabelPrintLog();
+ //log.BoxCode = data.BoxCode1;
+ //log.CreateTime = DateTime.Now;
+ //log.Demo = Demo;
+ //log.Isdel = 0;
+ //log.CreateUser = userId;
+ //printlog.Add(log);
+
+ #endregion
+ }
+ else
+ {
+ #region 澶氫釜鏀爜鏍囩 寮�濮�-缁撴潫
+
+ if (string.IsNullOrWhiteSpace(boxNo2))
+ {
+ throw new Exception("璧峰鏀爜涓嶈兘涓虹┖");
+ }
+
+ var sql = $@"select * from BllBoxInfo where IsDel = '0' and Origin = 'WMS鐢熸垚' and BoxNo3 >='{boxNo2}' and BoxNo3 <= '{endBoxNo2}'";
+ var data2 = Db.Ado.SqlQuery<BllBoxInfo>(sql);
+
+ if (data2.Count == 0)
+ {
+ throw new Exception($"鏈煡璇㈠埌{boxNo2}-{endBoxNo2}涓俊鎭�");
+ }
+
+ var i = 0;
+ foreach (var data in data2)
+ {
+ // 鐗╂枡鏉＄爜淇℃伅璧嬪��
+ BoxInfoDto model = new BoxInfoDto();
+ model.SkuNo = data.SkuNo;
+ model.SkuName = data.SkuName;
+ model.LotNo = data.LotNo; //鎵规
+ model.SupplierLot = data.SupplierLot; // 鍘熷巶鎵瑰彿
+ model.Standard = data.Standard; // 瑙勬牸/鍨嬪彿
+ model.PackageStandard = data.PackageStandard; // 鍖呰瑙勬牸
+
+ model.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
+ model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+
+ model.Qty = data.Qty;// 鏁伴噺
+
+ model.BoxNo = data.BoxNo3; // 绠卞彿
+
+ model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 100, 25);
+
+ // 娣诲姞鍒發ist闆嗗悎
+ printModelList.Add(model);
+ i++;
+ ////娣诲姞鎵撳嵃璁板綍
+ //WmsLabelPrintLog log = new WmsLabelPrintLog();
+ //log.BoxCode = data.BoxCode1;
+ //log.CreateTime = DateTime.Now;
+ //log.Demo = Demo;
+ //log.Isdel = 0;
+ //log.CreateUser = userId;
+ //printlog.Add(log);
+ if (i >= 100)
+ {
+ break;
+ }
+ }
+
+ #endregion
+ }
+ break;
+ case "3":
+ if (string.IsNullOrWhiteSpace(endBoxNo))
+ {
+ if (string.IsNullOrWhiteSpace(boxNo))
+ {
+ throw new Exception("璧峰绠辩爜涓嶈兘涓虹┖");
+ }
+ #region 绠辩爜鍜岀鐮佸唴鐨勬敮鐮�
+
+ if (!string.IsNullOrWhiteSpace(boxNo2))
+ {
+ if (string.IsNullOrWhiteSpace(endBoxNo2)) //鍗曚釜鏀爜鍜岀鐮�
+ {
+ #region 鍗曚釜鏀爜鍜岀鐮�
+
+ var dataList = list.Where(m => m.BoxNo == boxNo);
+ var data = list.FirstOrDefault(m => m.BoxNo3 == boxNo2);
+ if (data == null)
+ {
+ throw new Exception($"鏈煡璇㈠埌{boxNo2}淇℃伅");
+ }
+
+ if (data.BoxNo != boxNo)//鍒ゆ柇绠辩爜鏄惁鐩稿悓
+ {
+ throw new Exception($"褰撳墠鏀爜涓嶆槸绠辩爜鍐�");
+ }
+
+
+ // 鐗╂枡鏉＄爜淇℃伅璧嬪�� 绠辩爜
+ BoxInfoDto model1 = new BoxInfoDto();
+ model1.SkuNo = data.SkuNo;
+ model1.SkuName = data.SkuName;
+ model1.LotNo = data.LotNo; //鎵规
+ model1.SupplierLot = data.SupplierLot; // 鍘熷巶鎵瑰彿
+ model1.Standard = data.Standard; // 瑙勬牸/鍨嬪彿
+ model1.PackageStandard = data.PackageStandard; // 鍖呰瑙勬牸
+
+ model1.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
+ model1.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model1.Qty = dataList.Sum(m=>m.Qty);// 鏁伴噺
+ model1.BoxNo = data.BoxNo; // 绠卞彿
+
+ model1.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 100, 25);
+
+ // 娣诲姞鍒發ist闆嗗悎
+ printModelList.Add(model1);
+
+ // 鐗╂枡鏉＄爜淇℃伅璧嬪�� 鏀爜
+ BoxInfoDto model = new BoxInfoDto();
+ model.SkuNo = data.SkuNo;
+ model.SkuName = data.SkuName;
+ model.LotNo = data.LotNo; //鎵规
+ model.SupplierLot = data.SupplierLot; // 鍘熷巶鎵瑰彿
+ model.Standard = data.Standard; // 瑙勬牸/鍨嬪彿
+ model.PackageStandard = data.PackageStandard; // 鍖呰瑙勬牸
+
+ model.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
+ model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.Qty = data.Qty;// 鏁伴噺
+ model.BoxNo = data.BoxNo3; // 鏀彿
+
+ model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 100, 25);
+
+ // 娣诲姞鍒發ist闆嗗悎
+ printModelList.Add(model);
+ ////娣诲姞鎵撳嵃璁板綍
+ //WmsLabelPrintLog log = new WmsLabelPrintLog();
+ //log.BoxCode = data.BoxCode1;
+ //log.CreateTime = DateTime.Now;
+ //log.Demo = Demo;
+ //log.Isdel = 0;
+ //log.CreateUser = userId;
+ //printlog.Add(log);
+ #endregion
+ }
+ else//涓�绠卞唴鏌愬嚑涓敮鐮�
+ {
+ #region 鍗曚釜绠辩爜鍜屽涓敮鐮�
+
+ var sql = $@"select * from BllBoxInfo where IsDel = '0' and Origin = 'WMS鐢熸垚' and BoxNo3 >='{boxNo2}' and BoxNo3 <= '{endBoxNo2}'";
+ var data2 = Db.Ado.SqlQuery<BllBoxInfo>(sql);
+
+ if (data2.Count == 0)
+ {
+ throw new Exception($"鏈煡璇㈠埌{boxNo2}-{endBoxNo2}涓俊鎭�");
+ }
+
+ if (data2.Count(m => m.BoxNo != boxNo) > 0)
+ {
+ throw new Exception($"{boxNo2}-{endBoxNo2}涓俊鎭湁涓嶅睘浜巤boxNo}绠辩爜鍐呯殑");
+ }
+
+ var data = list.Where(m => m.BoxNo == boxNo);
+ var boxData = data2.FirstOrDefault();
+ // 鐗╂枡鏉＄爜淇℃伅璧嬪��
+ BoxInfoDto model = new BoxInfoDto();
+ model.SkuNo = boxData.SkuNo;
+ model.SkuName = boxData.SkuName;
+ model.LotNo = boxData.LotNo; //鎵规
+ model.SupplierLot = boxData.SupplierLot; // 鍘熷巶鎵瑰彿
+ model.Standard = boxData.Standard; // 瑙勬牸/鍨嬪彿
+ model.PackageStandard = boxData.PackageStandard; // 鍖呰瑙勬牸
+
+ model.ExpirationTime = boxData.ExpirationTime; // 鏈夋晥鏈熻嚦
+ model.StoreTime = boxData.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.Qty = data.Sum(m => m.Qty); // 鏁伴噺
+ model.BoxNo = boxData.BoxNo; // 鏀彿
+
+ model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 100, 25);
+
+ // 娣诲姞鍒發ist闆嗗悎
+ printModelList.Add(model);
+
+ var i = 0;
+ foreach (var item in data2)
+ {
+ // 鐗╂枡鏉＄爜淇℃伅璧嬪��
+ BoxInfoDto model1 = new BoxInfoDto();
+ model1.SkuNo = item.SkuNo;
+ model1.SkuName = item.SkuName;
+ model1.LotNo = item.LotNo; //鎵规
+ model1.SupplierLot = item.SupplierLot; // 鍘熷巶鎵瑰彿
+ model1.Standard = item.Standard; // 瑙勬牸/鍨嬪彿
+ model1.PackageStandard = item.PackageStandard; // 鍖呰瑙勬牸
+
+ model1.ExpirationTime = item.ExpirationTime; // 鏈夋晥鏈熻嚦
+ model1.StoreTime = item.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model1.Qty = item.Qty;// 鏁伴噺
+ model1.BoxNo = item.BoxNo3; // 鏀彿
+
+ model.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 100, 25);
+
+ // 娣诲姞鍒發ist闆嗗悎
+ printModelList.Add(model);
+ i++;
+ ////娣诲姞鎵撳嵃璁板綍
+ //WmsLabelPrintLog log = new WmsLabelPrintLog();
+ //log.BoxCode = item.BoxCode1;
+ //log.CreateTime = DateTime.Now;
+ //log.Demo = Demo;
+ //log.Isdel = 0;
+ //log.CreateUser = userId;
+ //printlog.Add(log);
+ if (i >= 100)
+ {
+ break;
+ }
+ }
+
+ #endregion
+ }
+ }
+ else //鏁寸鏀爜鍜屼竴涓鐮�
+ {
+ #region 鏁寸鏀爜鍜屼竴涓鐮�
+
+ var data = list.Where(m => m.BoxNo == boxNo).ToList();
+ var boxData = data.FirstOrDefault();
+ if (boxData == null)
+ {
+ throw new Exception($"鏈煡璇㈠埌{boxNo}绠辩爜淇℃伅");
+ }
+ // 鐗╂枡鏉＄爜淇℃伅璧嬪��
+ BoxInfoDto model = new BoxInfoDto();
+ model.SkuNo = boxData.SkuNo;
+ model.SkuName = boxData.SkuName;
+ model.LotNo = boxData.LotNo; //鎵规
+ model.SupplierLot = boxData.SupplierLot; // 鍘熷巶鎵瑰彿
+ model.Standard = boxData.Standard; // 瑙勬牸/鍨嬪彿
+ model.PackageStandard = boxData.PackageStandard; // 鍖呰瑙勬牸
+
+ model.ExpirationTime = boxData.ExpirationTime; // 鏈夋晥鏈熻嚦
+ model.StoreTime = boxData.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.Qty = data.Sum(m => m.Qty); // 鏁伴噺
+ model.BoxNo = boxData.BoxNo; // 鏀彿
+
+ model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 100, 25);
+
+ // 娣诲姞鍒發ist闆嗗悎
+ printModelList.Add(model);
+
+ if (data.Count(m => !string.IsNullOrWhiteSpace(m.BoxNo3)) > 0) //鍒ゆ柇鏄惁鏈夋敮鐮�
+ {
+ var i = 0;
+ foreach (var item in data)
+ {
+ // 鐗╂枡鏉＄爜淇℃伅璧嬪��
+ BoxInfoDto model1 = new BoxInfoDto();
+ model1.SkuNo = item.SkuNo;
+ model1.SkuName = item.SkuName;
+ model1.LotNo = item.LotNo; //鎵规
+ model1.SupplierLot = item.SupplierLot; // 鍘熷巶鎵瑰彿
+ model1.Standard = item.Standard; // 瑙勬牸/鍨嬪彿
+ model1.PackageStandard = item.PackageStandard; // 鍖呰瑙勬牸
+
+ model1.ExpirationTime = item.ExpirationTime; // 鏈夋晥鏈熻嚦
+ model1.StoreTime = item.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model1.Qty = item.Qty; // 鏁伴噺
+ model1.BoxNo = item.BoxNo3; // 鏀彿
+
+ model1.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 100, 25);
+
+
+ // 娣诲姞鍒發ist闆嗗悎
+ printModelList.Add(model1);
+ i++;
+ ////娣诲姞鎵撳嵃璁板綍
+ //WmsLabelPrintLog log = new WmsLabelPrintLog();
+ //log.BoxCode = item.BoxCode1;
+ //log.CreateTime = DateTime.Now;
+ //log.Demo = Demo;
+ //log.Isdel = 0;
+ //log.CreateUser = userId;
+ //printlog.Add(log);
+ if (i >= 100)
+ {
+ break;
+ }
+ }
+ }
+ else
+ {
+ throw new Exception("褰撳墠绠卞唴娌℃湁鏀爜");
+ }
+ #endregion
+ }
+ #endregion
+ }
+ else
+ {
+ if (string.IsNullOrWhiteSpace(boxNo))
+ {
+ throw new Exception("璧峰绠辩爜涓嶈兘涓虹┖");
+ }
+
+ #region 澶氫釜绠辩爜鍜屽唴鏀爜
+
+ var sql = $@"select * from BllBoxInfo where IsDel = '0' and Origin = 'WMS鐢熸垚' and BoxNo >='{boxNo}' and BoxNo <= '{endBoxNo}'";
+ var data2 = Db.Ado.SqlQuery<BllBoxInfo>(sql);
+ var data3 = data2.GroupBy(m => m.BoxNo).Select(m => m.Key).OrderBy(m => m).ToList();
+ if (data3.Count == 0)
+ {
+ throw new Exception($"鏈煡璇㈠埌{boxNo}-{endBoxNo}涓俊鎭�");
+ }
+ var i = 0;
+ var j = 0;
+ foreach (var demo in data3)
+ {
+ var data = list.Where(m => m.BoxNo == demo).ToList();
+ var boxData = data.FirstOrDefault();
+ if (boxData == null)
+ {
+ throw new Exception($"鏈煡璇㈠埌{demo}绠辩爜淇℃伅");
+ }
+ // 鐗╂枡鏉＄爜淇℃伅璧嬪��
+ BoxInfoDto model = new BoxInfoDto();
+ model.SkuNo = boxData.SkuNo;
+ model.SkuName = boxData.SkuName;
+ model.LotNo = boxData.LotNo; //鎵规
+ model.SupplierLot = boxData.SupplierLot; // 鍘熷巶鎵瑰彿
+ model.Standard = boxData.Standard; // 瑙勬牸/鍨嬪彿
+ model.PackageStandard = boxData.PackageStandard; // 鍖呰瑙勬牸
+
+ model.ExpirationTime = boxData.ExpirationTime; // 鏈夋晥鏈熻嚦
+ model.StoreTime = boxData.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.Qty = data.Sum(m => m.Qty); // 鏁伴噺
+ model.BoxNo = boxData.BoxNo; // 鏀彿
+
+ model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 100, 25);
+
+ // 娣诲姞鍒發ist闆嗗悎
+ printModelList.Add(model);
+
+ j++;
+ if (j >= 100)
+ {
+ break;
+ }
+ if (data.Count(m => !string.IsNullOrWhiteSpace(m.BoxNo3)) > 0) //鍒ゆ柇鏄惁鏈夋敮鐮�
+ {
+ foreach (var item in data.OrderBy(m => m.BoxNo3).ToList())
+ {
+ // 鐗╂枡鏉＄爜淇℃伅璧嬪��
+ BoxInfoDto model1 = new BoxInfoDto();
+ model1.SkuNo = item.SkuNo;
+ model1.SkuName = item.SkuName;
+ model1.LotNo = item.LotNo; //鎵规
+ model1.SupplierLot = item.SupplierLot; // 鍘熷巶鎵瑰彿
+ model1.Standard = item.Standard; // 瑙勬牸/鍨嬪彿
+ model1.PackageStandard = item.PackageStandard; // 鍖呰瑙勬牸
+
+ model1.ExpirationTime = item.ExpirationTime; // 鏈夋晥鏈熻嚦
+ model1.StoreTime = item.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model1.Qty = item.Qty;// 鏁伴噺
+ model1.BoxNo = item.BoxNo3; // 鏀彿
+
+ model.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 100, 25);
+
+ // 娣诲姞鍒發ist闆嗗悎
+ printModelList.Add(model1);
+ i++;
+ ////娣诲姞鎵撳嵃璁板綍
+ //WmsLabelPrintLog log = new WmsLabelPrintLog();
+ //log.BoxCode = item.BoxCode1;
+ //log.CreateTime = DateTime.Now;
+ //log.Demo = Demo;
+ //log.Isdel = 0;
+ //log.CreateUser = userId;
+ //printlog.Add(log);
+ if (i >= 100)
+ {
+ break;
+ }
+ }
+ }
+
+ }
+
+ #endregion
+ }
+ break;
+ default:
+ throw new Exception("璇烽�夋嫨琛ユ墦绫诲瀷");
+ }
+
+ #endregion
+
+ //dataContext.WmsLabelPrintLog.InsertAllOnSubmit(printlog);
+ // dataContext.SubmitChanges();
+ // return printModel;
+ return printModelList;
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
}
}
diff --git a/Wms/WMS.IBLL/IBllAsnServer/IBllBoxInfoServer.cs b/Wms/WMS.IBLL/IBllAsnServer/IBllBoxInfoServer.cs
index aeb95b6..0b2d515 100644
--- a/Wms/WMS.IBLL/IBllAsnServer/IBllBoxInfoServer.cs
+++ b/Wms/WMS.IBLL/IBllAsnServer/IBllBoxInfoServer.cs
@@ -57,5 +57,18 @@
/// <returns></returns>
List<BllBoxInfo> AddLabelBox(int imId, string isReset, decimal arriveQty, string productionTime, string expirationTime, string storeTime, int userId);
+ /// <summary>
+ /// 琛ユ墦鏍囩
+ /// </summary>
+ /// <param name="boxNo">寮�濮嬬鐮�</param>
+ /// <param name="endBoxNo">缁撴潫绠辩爜</param>
+ /// <param name="boxNo2">寮�濮嬫敮鐮�</param>
+ /// <param name="endBoxNo2">缁撴潫鏀爜</param>
+ /// <param name="type">1绠辩爜 2鏀爜 3绠辩爜鍜屾敮鐮�</param>
+ /// <param name="userId">鎿嶄綔浜篒D</param>
+ /// <returns></returns>
+ List<BoxInfoDto> GetBuDaLabelList(string boxNo, string endBoxNo, string boxNo2, string endBoxNo2, string type,
+ int userId);
+
}
}
diff --git a/Wms/Wms/Controllers/BllAsnController.cs b/Wms/Wms/Controllers/BllAsnController.cs
index 9117497..7d3679d 100644
--- a/Wms/Wms/Controllers/BllAsnController.cs
+++ b/Wms/Wms/Controllers/BllAsnController.cs
@@ -901,6 +901,34 @@
}
}
+
+ [HttpPost]
+ public IActionResult GetBuDaLabelList(BuDaLabelBoxVm model)
+ {
+ try
+ {
+ //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(userId))
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ var list = _BoxInfoSvc.GetBuDaLabelList(model.BoxNo, model.EndBoxNo, model.BoxNo2, model.EndBoxNo2,model.Type,int.Parse(userId));
+ return Ok(new { code = 0, msg = "鑾峰彇琛ユ墦绠辩爜鏍囩淇℃伅", data = list });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, count = 0, msg = e.Message });
+ }
+ }
+
+
+
#endregion
}
--
Gitblit v1.8.0