From e91b60bf41064a456e398064c87b38adf0467eff Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期五, 02 二月 2024 08:01:02 +0800
Subject: [PATCH] 修改标签
---
Wms/WMS.Entity/BllAsnEntity/BllLabelBoxNo.cs | 21 +
Wms/WMS.IBLL/IBllAsnServer/IBllLabelBoxNoServer.cs | 8
Wms/Wms/Controllers/BllAsnController.cs | 15
HTML/views/ASNSetting/ArrivalNotice.html | 18
Wms/Model/ModelDto/BllAsnDto/LabelBoxDto.cs | 3
Wms/WMS.BLL/BllAsnServer/BllLabelBoxNoServer.cs | 722 ++++++++++++++++++++++++++++++++++++++++
HTML/views/ASNSetting/LabelPrint.html | 116 +++---
HTML/views/ASNSetting/LabelPrintSelect.html | 148 +++++---
8 files changed, 922 insertions(+), 129 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 825e782..8a9d0db 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -1136,6 +1136,7 @@
//鏄庣粏琛ㄦ搷浣滄爮浜嬩欢
table.on('tool(LAY-app-content-list2)', function (obj) {
var data = obj.data;
+ var id = data.Id;
switch(obj.event)
{
case "del" :
@@ -1171,7 +1172,7 @@
title: '鐢熸垚鏍囩',
content: 'LabelPrintSelect.html',
maxmin: true,
- area: ['460px', '460px'],
+ area: ['480px', '615px'],
btn: ['纭畾','鍙栨秷'],
yes: function(index, layero){
var iframeWindow = window['layui-layer-iframe'+ index]
@@ -1182,20 +1183,13 @@
var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
console.log(field);
//鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
- var param = {
- Id: data.Id,
- Reset: field.reset, //閲嶇疆鎵瑰彿
- Level: field.level, //鏍囩绾у埆 1/2绾�
- Type:field.type, //鍏崇郴灞傜骇 鏈�/鏃犲眰绾�
- ArriveQty:field.arriveQty, //鍒拌揣鏁伴噺
- BoxType:field.boxType ,// 绠辨敮绫诲瀷 绠�/鏀�
- Qty:field.qty //绠�/鏀暟閲�
- };
- console.log(param);
+ //"&Level="+field.level+"&Type="+field.type+"&BoxType="+field.boxType+"&Qty="+field.qty+
+ var str = "Id="+id+"&Reset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime;
+
layer.open({
type: 2,
title: '鐢熸垚鏍囩',
- content: 'LabelPrint.html',
+ content: 'LabelPrint.html?'+str,
maxmin: true,
area: ['660px', '660px'],
btn: ['鍙栨秷'],
diff --git a/HTML/views/ASNSetting/LabelPrint.html b/HTML/views/ASNSetting/LabelPrint.html
index c1d7a6b..1704e72 100644
--- a/HTML/views/ASNSetting/LabelPrint.html
+++ b/HTML/views/ASNSetting/LabelPrint.html
@@ -27,6 +27,16 @@
<body>
<div style="width:100%;text-align: center;">
+ <div style="padding-top: 10px;text-align: left; margin-left: 5%;" id="button">
+ <div class="layui-inline">
+ <button id="btnAdd" class="layui-btn layui-btn-sm" lay-event="Add2"><i
+ class="layui-icon"></i>鐢熸垚鏍囩</button>
+ </div>
+ <div class="layui-inline">
+ <button id="btnPrint" class="layui-btn layui-btn-sm" lay-event="Add"><i
+ class="layui-icon"></i>鎵撳嵃</button>
+ </div>
+ </div>
<div class="layui-form" lay-filter="layuiadmin-app-form-list" id="print"
style="width: 100%;height:100%; text-align: right;padding-top: 5px;margin-left: 0%;">
<div>
@@ -44,7 +54,7 @@
</tr>
<tr>
<td>鍝佸悕</td>
- <td colspan="3" id="goodName"></td>
+ <td colspan="3" id="SkuName"></td>
</tr>
<tr>
<td>瑙勬牸/鍨嬪彿</td>
@@ -56,7 +66,7 @@
<td>杩涘巶缂栧彿</td>
<td style="padding: 1px 0px;"></td>
<td>鐗╂枡浠ｇ爜</td>
- <td style="padding: 1px 0px;"> </td>
+ <td id="SkuNo"> </td>
</tr>
<tr>
<td>鍘熷巶鎵瑰彿</td>
@@ -80,49 +90,8 @@
</div>
<div style="page-break-after: always;"></div>
- </div>
- <hr>
- <div style="padding-top: 10px;text-align: left;" id="button">
- <div class="layui-inline" style="margin-right: 10px;">
- <span style="padding-right: 5px;">鏄惁閲嶇疆鎵规:</span>
- <span style="padding-right: 5px;">鏄�</span><input type="radio" checked="true" name="isprint" value="1">
- <span style="padding-right: 5px;">鍚�</span><input type="radio" name="isprint" value="0">
- </div>
- <div class="layui-inline">
- 鍒拌揣鏁伴噺锛�<div class="layui-input-inline">
- <input type="text"
- oninput="value=value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d).*$/,'$1$2.$3')"
- onafterpaste="this.value=this.value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d).*$/,'$1$2.$3')"
- name="skuNum" id="skuNum" lay-verify="skuNum" placeholder="" style="width: 100px;"
- autocomplete="off" class="layui-input InputCss">
- </div>
- </div>
- <div class="layui-inline">
- 绠辨爣绛炬暟閲忥細<div class="layui-input-inline">
- <input type="text" onkeyup="this.value=this.value.replace(/^0{1,}/g,'')"
- onafterpaste="this.value=this.value.replace(/^0{1,}/g,'')" name="bQNum" id="bQNum"
- lay-verify="bQNum" placeholder="" style="width: 100px;" autocomplete="off"
- class="layui-input InputCss">
- </div>
- </div>
-
- <div>
- <div class="layui-inline" style="padding-top: 5px">
- 涓�绾ф爣绛惧繀褰曞弬鏁帮細绠卞唴鏁伴噺锛�<div class="layui-input-inline">
- <input type="text"
- oninput="value=value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d).*$/,'$1$2.$3')"
- onafterpaste="this.value=this.value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d).*$/,'$1$2.$3')"
- name="number" id="number" lay-verify="number" placeholder="" style="width: 70px;"
- autocomplete="off" class="layui-input InputCss">
- </div>
- </div>
- <div class="layui-inline">
- <button id="btnPrint" class="layui-btn layui-btn-sm" lay-event="Add"><i
- class="layui-icon"></i>鎵撳嵃</button>
- </div>
- </div>
- </div>
-
+ </div>
+
</div>
<script src="../../layuiadmin/layui/layui.js"></script>
<script src="../../js/public.js"></script>
@@ -141,20 +110,22 @@
form = layui.form,
layer = layui.layer;
var laydate = layui.laydate;
- 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 id = getQueryString('id');
- var xun = 0;
+
+ var id = getQueryString('Id');
+ var reset = getQueryString('Reset');
+ var arriveQty = getQueryString('ArriveQty');
+
+ var productionTime = getQueryString('ProductionTime');
+ var expirationTime = getQueryString('ExpirationTime');
+ var storeTime = getQueryString('StoreTime');
+ // var level = getQueryString('Level');
+ // var type = getQueryString('Type');
+ // var boxType = getQueryString('BoxType');
+ // var qty = getQueryString('Qty');
+
+ console.log(productionTime);
+ console.log(expirationTime);
+ console.log(storeTime);
$('#btnPrint').on('click', function () {
var param = {
@@ -204,7 +175,30 @@
id = 0;
}
else {
- div(-1, 1, 0);
+ var param = {
+ id: id,
+ };
+ synData(IP + "/BllAsn/GetLabelBoxModel", param , 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ $("#SkuName").html(res.data.SkuName);
+ $("#Standard").html(res.data.Standard);
+ $("#PackageStandard").html(res.data.PackageStandard);
+ $("#SkuNo").html(res.data.SkuNo);
+ $("#SupplierLot").html(res.data.SupplierLot);
+ $("#ExpirationTime").html(expirationTime);
+ $("#StoreTime").html( storeTime);
+
+ // $("#imgBar").attr("src", res.data[0].imageStr);
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+
+ // div(-1, 1, 0);
+
}
@@ -336,7 +330,7 @@
// 鑾峰彇浼犻�掑弬鏁�
function getQueryString(name) {
var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
- var r = window.location.search.substr(1).match(reg);
+ var r = window.location.search.substr(1).match(reg);
if (r != null) return unescape(r[2]);
return null;
}
diff --git a/HTML/views/ASNSetting/LabelPrintSelect.html b/HTML/views/ASNSetting/LabelPrintSelect.html
index 31beeec..1b021e4 100644
--- a/HTML/views/ASNSetting/LabelPrintSelect.html
+++ b/HTML/views/ASNSetting/LabelPrintSelect.html
@@ -10,6 +10,25 @@
</head>
<body>
<div class="layui-form" lay-filter="layuiadmin-app-form-list" id="layuiadmin-app-form-list" style="padding: 20px 30px 0 0;">
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐢熶骇鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="text" name="productionTime" id="productionTime" placeholder="璇疯緭鍏ョ敓浜ф棩鏈�" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏈夋晥鏈熻嚦</label>
+ <div class="layui-input-block">
+ <input type="text" name="expirationTime" id="expirationTime" placeholder="璇疯緭鍏ユ湁鏁堟湡鑷�" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍌ㄥ瓨鏈熻嚦</label>
+ <div class="layui-input-block">
+ <input type="text" name="storeTime" id="storeTime" placeholder="璇疯緭鍏ュ偍瀛樻湡鑷�" autocomplete="off" class="layui-input">
+ </div>
+ </div>
<div class="layui-form-item">
<label class="layui-form-label">閲嶇疆鎵瑰彿</label>
<div class="layui-input-block">
@@ -19,7 +38,7 @@
</select>
</div>
</div>
- <div class="layui-form-item">
+ <!-- <div class="layui-form-item">
<label class="layui-form-label">鏍囩绾у埆</label>
<div class="layui-input-block">
<select name="level" id="level" lay-filter="levelFil" lay-verify="required">
@@ -36,14 +55,16 @@
<option value="0">鏃犲眰绾�</option>
</select>
</div>
- </div>
+ </div> -->
<div class="layui-form-item">
<label class="layui-form-label">鍒拌揣鏁伴噺</label>
<div class="layui-input-block">
- <input type="text" name=arriveQty" id="arriveQty" lay-verify="required" placeholder="璇疯緭鍏ュ贩閬撳悕绉�" autocomplete="off" class="layui-input">
+ <input type="text" name="arriveQty" id="arriveQty" lay-verify="required" placeholder="璇疯緭鍏ュ埌璐ф暟閲�" autocomplete="off" class="layui-input" oninput="value=value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')"
+ onafterpaste="this.value=this.value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')">
</div>
</div>
- <div class="layui-form-item" id="boxTypeDiv" style="display: none;">
+
+ <!-- <div class="layui-form-item" id="boxTypeDiv" style="display: none;">
<label class="layui-form-label">绠辨敮绫诲瀷</label>
<div class="layui-input-block">
<select name="boxType" id="boxType" lay-filter="boxTypeFil" lay-search>
@@ -56,9 +77,10 @@
<div class="layui-form-item" id="qtyDiv" style="display: none;">
<label class="layui-form-label">鏁伴噺</label>
<div class="layui-input-block">
- <input type="text" name="qty" id="qty" placeholder="璇疯緭鍏ュ贩閬撳悕绉�" autocomplete="off" class="layui-input">
+ <input type="text" name="qty" id="qty" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" class="layui-input" oninput="value=value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')"
+ onafterpaste="this.value=this.value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')">
</div>
- </div>
+ </div> -->
<div class="layui-form-item layui-hide">
<input type="button" lay-submit lay-filter="layuiadmin-app-form-submit" id="layuiadmin-app-form-submit" value="纭娣诲姞">
<input type="button" lay-submit lay-filter="layuiadmin-app-form-edit" id="layuiadmin-app-form-edit" value="纭缂栬緫">
@@ -75,64 +97,78 @@
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'layer'], function() {
+ }).use(['index', 'form', 'layer', 'laydate'], function() {
var $ = layui.$;
var form = layui.form;
var layer = layui.layer;
- form.on('select(levelFil)', function(data){
- console.log($("#type").val());
- var type = $("#type").val();
- if (data.value == "1" ) {
- $("#boxTypeDiv").css("display","none");
- form.val("layuiadmin-app-form-list", {
- "boxType": ""
- });
- $("#boxType").removeAttr("lay-verify");
+ var laydate = layui.laydate;
+ laydate.render({
+ elem: '#productionTime'
+ , format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
+ });
+ laydate.render({
+ elem: '#expirationTime'
+ , format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
+ });
+ laydate.render({
+ elem: '#storeTime'
+ , format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
+ });
- $("#qtyDiv").css("display","none");
- $("#qty").removeAttr("lay-verify");
- $("#qty").val("");
+ // form.on('select(levelFil)', function(data){
+ // console.log($("#type").val());
+ // var type = $("#type").val();
+ // if (data.value == "1" ) {
+ // $("#boxTypeDiv").css("display","none");
+ // form.val("layuiadmin-app-form-list", {
+ // "boxType": ""
+ // });
+ // $("#boxType").removeAttr("lay-verify");
- form.render('select');
- }
- if (data.value == "2" && type == "0") {
- $("#boxTypeDiv").css("display","block");
- $("#boxType").attr("lay-verify","required");
+ // $("#qtyDiv").css("display","none");
+ // $("#qty").removeAttr("lay-verify");
+ // $("#qty").val("");
+
+ // form.render('select');
+ // }
+ // if (data.value == "2" && type == "0") {
+ // $("#boxTypeDiv").css("display","block");
+ // $("#boxType").attr("lay-verify","required");
- }
- });
- form.on('select(typeFil)', function(data){
- var level = $("#level").val();
- if (data.value == "1") {
- $("#boxTypeDiv").css("display","none");
+ // }
+ // });
+ // form.on('select(typeFil)', function(data){
+ // var level = $("#level").val();
+ // if (data.value == "1") {
+ // $("#boxTypeDiv").css("display","none");
- form.val("layuiadmin-app-form-list", {
- "boxType": ""
- });
- $("#boxType").removeAttr("lay-verify");
-
- $("#qtyDiv").css("display","none");
- $("#qty").removeAttr("lay-verify");
- $("#qty").val("");
- form.render('select');
- }
- if (data.value == "0" && level == "2") {
- $("#boxTypeDiv").css("display","block");
- $("#boxType").attr("lay-verify","required");
+ // form.val("layuiadmin-app-form-list", {
+ // "boxType": ""
+ // });
+ // $("#boxType").removeAttr("lay-verify");
- }
- });
- form.on('select(boxTypeFil)', function(data){
- if (data.value == "1") { //绠�
- $("#qtyDiv").css("display","none");
- $("#qty").removeAttr("lay-verify");
- $("#qty").val("");
- }
- if (data.value == "2" ) {
- $("#qtyDiv").css("display","block");
- $("#qty").attr("lay-verify","required");
- }
- });
+ // $("#qtyDiv").css("display","none");
+ // $("#qty").removeAttr("lay-verify");
+ // $("#qty").val("");
+ // form.render('select');
+ // }
+ // if (data.value == "0" && level == "2") {
+ // $("#boxTypeDiv").css("display","block");
+ // $("#boxType").attr("lay-verify","required");
+
+ // }
+ // });
+ // form.on('select(boxTypeFil)', function(data){
+ // if (data.value == "1") { //绠�
+ // $("#qtyDiv").css("display","none");
+ // $("#qty").removeAttr("lay-verify");
+ // $("#qty").val("");
+ // }
+ // if (data.value == "2" ) {
+ // $("#qtyDiv").css("display","block");
+ // $("#qty").attr("lay-verify","required");
+ // }
+ // });
})
diff --git a/Wms/Model/ModelDto/BllAsnDto/LabelBoxDto.cs b/Wms/Model/ModelDto/BllAsnDto/LabelBoxDto.cs
index 716c14e..c0203d7 100644
--- a/Wms/Model/ModelDto/BllAsnDto/LabelBoxDto.cs
+++ b/Wms/Model/ModelDto/BllAsnDto/LabelBoxDto.cs
@@ -18,6 +18,9 @@
public decimal Qty { get; set; }
public string SkuNo { get; set; }
public string SkuName { get; set; }
+ public string Standard { get; set; }
+ public string PackageStandard { get; set; }
+ public DateTime? StoreTime { get; set; }
public string LotNo { get; set; }
public string LotText { get; set; }
public string SupplierName { get; set; }
diff --git a/Wms/WMS.BLL/BllAsnServer/BllLabelBoxNoServer.cs b/Wms/WMS.BLL/BllAsnServer/BllLabelBoxNoServer.cs
index 8309e3f..5cde872 100644
--- a/Wms/WMS.BLL/BllAsnServer/BllLabelBoxNoServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/BllLabelBoxNoServer.cs
@@ -47,6 +47,9 @@
Qty = a.Qty,
SkuNo = a.SkuNo,
SkuName = a.SkuName,
+ Standard = a.Standard,
+ PackageStandard = a.PackageStandard,
+ StoreTime = a.StoreTime,
LotNo = a.LotNo,
LotText = a.LotText,
SupplierName = a.SupplierName,
@@ -79,5 +82,724 @@
throw new Exception(e.Message);
}
}
+
+ //鑾峰彇鏍囩妯℃澘鏍规嵁鍏ュ簱鍗曟槑缁咺D
+ public LabelBoxDto GetLabelBoxModel(int id)
+ {
+ try
+ {
+ var asnDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.Id == id && m.IsDel == "0");
+ if (asnDetail == null)
+ {
+ throw new Exception("鏈煡璇㈠埌鍗曟嵁鏄庣粏淇℃伅锛岃鏍稿疄");
+ }
+
+ var packInfo = Db.Queryable<SysPackag>().First(m => m.IsDel == "0" && m.PackagNo == asnDetail.PackagNo);
+ if (packInfo == null)
+ {
+ throw new Exception("鏈煡璇㈠埌鍗曟嵁鏄庣粏涓殑鐗╂枡鍖呰淇℃伅");
+ }
+
+ var str = "";
+
+ if (!string.IsNullOrWhiteSpace(packInfo.L1Name))
+ {
+ str += packInfo.L1Num + "/" + packInfo.L1Name;
+ }
+ if (!string.IsNullOrWhiteSpace(packInfo.L2Name))
+ {
+ str += "-" + packInfo.L2Num + "/" + packInfo.L2Name;
+ }
+ if (!string.IsNullOrWhiteSpace(packInfo.L3Name))
+ {
+ str += "-" + packInfo.L3Num + "/" + packInfo.L3Name;
+ }
+ if (!string.IsNullOrWhiteSpace(packInfo.L4Name))
+ {
+ str += "-" + packInfo.L4Num + "/" + packInfo.L4Name;
+ }
+ if (!string.IsNullOrWhiteSpace(packInfo.L5Name))
+ {
+ str += "-" + packInfo.L5Num + "/" + packInfo.L5Name;
+ }
+
+
+ var data = new LabelBoxDto();
+ data.SkuNo = asnDetail.SkuNo;
+ data.SkuName = asnDetail.SkuName;
+ data.Standard = asnDetail.Standard;
+ data.SupplierLot = asnDetail.SupplierLot;
+ data.PackageStandard = str;
+ return data;
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+
+
+ ///// <summary>
+ ///// 鑾峰彇鐗╂枡鏍囩淇℃伅JC06
+ ///// </summary>
+ ///// <param name="imId"></param>
+ ///// <param name="isPrint">鏄惁閲嶆柊鐢熸垚鑷湁鎵规 0:鍚� 1:鏄� </param>
+ ///// <param name="createUser">鍒涘缓浜�</param>
+ ///// <param name="number">绠卞唴鏁伴噺锛堜竴绾ф爣绛惧繀濉級</param>
+ ///// <param name="productionDate">鐢熶骇鏃ユ湡</param>
+ ///// <param name="supplierName">鐢熶骇鍘傚</param>
+ ///// <param name="supplierLot">鐢熶骇鍘傚鎵瑰彿</param>
+ ///// <param name="inspectTime">鏈夋晥鏈�</param>
+ ///// <param name="expirationTime">淇濊川鏈�</param>
+ ///// <param name="bQNum">澶栫鏍囩鏁伴噺</param>
+ ///// <param name="skuNum">鍒拌揣鏁伴噺</param>
+ ///// <returns></returns>
+ //public List<LabelPrint5Model> GetImport5Id(string imId, string isPrint, string createUser, decimal number, string productionDate,
+ // string supplierName, string supplierLot, string inspectTime, string expirationTime, int? bQNum, string skuNum)
+ //{
+ // try
+ // {
+ // using (LinqModelDataContext DataContext = new LinqModelDataContext(DataConnection.GetDataConnection))
+ // {
+ // #region 蹇呭～楠岃瘉
+
+ // if (string.IsNullOrWhiteSpace(productionDate))
+ // {
+ // throw new Exception("鐢熶骇鏃ユ湡闇�蹇呭～锛屼笉鑳戒负绌�");
+ // }
+
+ // var twoSeletOne = true;//鏈夋晥鏈熴�佸楠屾湡浜岄�変竴
+ // if (string.IsNullOrWhiteSpace(expirationTime))
+ // {
+ // twoSeletOne = false;
+ // }
+ // if (string.IsNullOrWhiteSpace(inspectTime))
+ // {
+ // twoSeletOne = false;
+ // }
+
+ // if (twoSeletOne)
+ // {
+ // throw new Exception("鏈夋晥鏈熴�佸楠屾湡鏈�濂藉～鍐欎竴涓�");
+ // }
+ // if (string.IsNullOrWhiteSpace(supplierName))
+ // {
+ // throw new Exception("鐢熶骇鍘傚闇�蹇呭～锛屼笉鑳戒负绌�");
+ // }
+ // if (string.IsNullOrWhiteSpace(supplierLot))
+ // {
+ // throw new Exception("鍘傚鎵瑰彿闇�蹇呭～锛屼笉鑳戒负绌�");
+ // }
+
+ // if (bQNum <= 0)
+ // {
+ // throw new Exception("澶栫鏍囩鏁伴噺涓嶈兘涓虹┖鎴栧皬浜庣瓑浜�0");
+ // }
+
+ // #endregion
+ // #region MyRegion
+
+ // var list = DataContext.View_ImportNotify.FirstOrDefault(a => a.ImportId == imId && a.IsDel == 0);
+ // List<LabelPrint5Model> printModel = new List<LabelPrint5Model>();
+
+ // if (list == null)
+ // {
+ // throw new Exception("鏈煡璇㈠埌鍗曟嵁淇℃伅");
+ // }
+ // var goodMap = DataContext.GoodMapAndMes.FirstOrDefault(m => m.WmsGoodCode == list.GoodsCode && m.IsDel == 0);
+ // var mesGood = "AAAA";
+ // if (goodMap != null)
+ // {
+ // mesGood = goodMap.MesGoodCode;
+ // }
+ // //鐗╂枡
+ // var good = DataContext.WmsBaseGoods.FirstOrDefault(m => m.GoodsDeleteFlag == 0 && m.GoodsCode == list.GoodsCode);
+ // var pack = DataContext.WmsBasePackaging.FirstOrDefault(m => m.IsDel == 0 && m.Id == good.GoodsPackaging);
+ // if (pack == null)
+ // {
+ // throw new Exception("鏈煡璇㈠埌褰撳墠鍗曟嵁涓墿鏂欑殑鍖呰淇℃伅");
+ // }
+ // //鏍囩琛�
+ // var labelData = DataContext.LabelPrint.Where(m => m.ImportId == imId).ToList();
+
+ // if (bQNum == null)
+ // {
+ // bQNum = 0;
+ // }
+ // var bNum = 0;//绠辩墿鍝佹暟閲�
+ // var zNum = 0;//鏀墿鍝佹暟閲�
+ // var packLevel = 0;
+ // var isGo = false;
+
+ // #endregion
+
+ // #region 鍖呰鏌ヨ
+
+ // //if (!string.IsNullOrWhiteSpace(pack.FivelevelNum))
+ // //{
+ // // if (pack.FivelevelUnit != "鎵�")
+ // // {
+ // // isGo = false;
+ // // packLevel = 5;
+ // // bNum = Convert.ToInt32(pack.FivelevelNum);
+ // // }
+ // //}
+ // //if (!string.IsNullOrWhiteSpace(pack.FourlevelNum) && isGo)
+ // //{
+ // // if (pack.FourlevelUnit != "鎵�")
+ // // {
+ // // isGo = false;
+ // // packLevel = 4;
+ // // bNum = Convert.ToInt32(pack.FourlevelNum);
+ // // }
+ // //}
+ // //if (!string.IsNullOrWhiteSpace(pack.ThreelevelNum) && isGo)
+ // //{
+ // // if (pack.ThreelevelUnit != "鎵�")
+ // // {
+ // // isGo = false;
+ // // packLevel = 3;
+ // // bNum = Convert.ToInt32(pack.ThreelevelNum);
+ // // }
+ // //}
+ // if (!string.IsNullOrWhiteSpace(pack.TwolevelNum))
+ // {
+ // packLevel = 2;
+ // bNum = Convert.ToInt32(pack.TwolevelNum);
+
+ // }
+ // if (!string.IsNullOrWhiteSpace(pack.OnelevelNum))
+ // {
+ // if (packLevel == 0)
+ // {
+ // packLevel = 1;
+ // bNum = Convert.ToInt32(pack.OnelevelNum);
+ // }
+ // zNum = Convert.ToInt32(pack.OnelevelNum);
+ // }
+
+ // if (packLevel <= 1)//鍖呰绛夌骇灏忎簬1锛屾寜鐓�1绾ф爣绛炬墦鍗�
+ // {
+ // packLevel = 1;
+ // }
+
+ // #endregion
+
+ // if (packLevel == 1)
+ // {
+ // #region 涓�绾у寘瑁�
+
+ // // 鏍规嵁鐢ㄦ埛杈撳叆鐨勭鏁伴噺璁＄畻闇�瑕佺殑鏉＄爜鏁�
+ // var labQty = labelData.Sum(m => m.Qty);
+ // var qty = Convert.ToDecimal(list.ImportQuantity) - (decimal)labQty;//褰撳墠鍗曟嵁鍓╀綑闇�瑕佹墦鍗扮殑鏁伴噺
+ // if (qty <= 0)
+ // {
+ // throw new Exception("褰撳墠鍗曟嵁鐗╂枡鏍囩宸叉墦鍗板畬姣曪紝濡傛湁闇�瑕佽琛ユ墦");
+ // }
+
+ // #region 澧炲姞鍒拌揣鏁伴噺
+ // if (skuNum != "")
+ // {
+ // if (qty - Convert.ToDecimal(skuNum) < 0)
+ // {
+ // throw new Exception("鍒拌揣鏁伴噺澶т簬鏈墦鏍囩鏁伴噺锛岃閲嶆柊杈撳叆鍒拌揣鏁伴噺!");
+ // }
+ // else
+ // {
+ // qty = Convert.ToDecimal(skuNum);
+ // }
+ // }
+ // #endregion
+
+ // int labelNum = 1; //鐢熶骇鏉＄爜鏁伴噺
+ // if (number > 0)
+ // {
+ // labelNum = int.Parse(Math.Ceiling(qty / number).ToString());//鏍囩鏁伴噺
+ // }
+ // else
+ // {
+ // throw new Exception("褰撳墠鍗曟嵁鐗╂枡鏄竴绾у寘瑁咃紝璇疯緭鍏ョ鍐呮暟閲忎笖澶т簬0");
+ // }
+
+ // if (bQNum >= 1)//鎵撳嵃鏍囩鏁伴噺鏄惁澶т簬1 (鏈夋墦鍗版爣绛炬暟閲�)
+ // {
+ // if (bQNum > 100)
+ // {
+ // throw new Exception("鎵撳嵃鏍囩鏁伴噺寤鸿鍦�100寮犱互鍐�");
+ // }
+ // if (bQNum < labelNum) //鎵撳嵃鐨勬爣绛炬暟閲忓ぇ浜庣瓑浜庡墿浣欒兘鎵撳嵃鐨勫紶鏁伴噺
+ // {
+ // labelNum = (int)bQNum;
+ // }
+ // }
+
+ // if (labelNum > 100)
+ // {
+ // labelNum = 100;
+ // }
+
+ // string maxCodestr = "";
+ // string maxboxcode = "";
+ // // 鐢熸垚鑷紪鎵瑰彿
+ // string toDayTime = DateTime.Now.ToString("yyyyMMdd");
+ // var diJiJian = 0;
+ // if (isPrint == "0")
+ // {
+ // var maxCode = DataContext.LabelPrint.Where(b => b.ImportId == imId).ToList().Max(a => a.ImportLotNo);
+ // var boxCode1 = DataContext.LabelPrint.Where(b => b.ImportId == imId).ToList().Max(a => a.LabelStream);
+ // maxCodestr = maxCode;
+ // maxboxcode = boxCode1;
+ // if (string.IsNullOrWhiteSpace(maxCodestr))
+ // {
+ // maxCodestr = toDayTime.Substring(2, 6) + "0001";
+ // }
+ // else
+ // {
+ // var q = DataContext.LabelPrint
+ // .Where(m => m.ImportId == imId && m.ImportLotNo == maxCodestr)
+ // .GroupBy(m => m.LabelStream).ToList();
+ // diJiJian = q.Count;
+ // }
+ // }
+ // else
+ // {
+ // var maxCode = DataContext.LabelPrint.Max(a => a.ImportLotNo); // 鑾峰彇浠婂ぉ鏈�澶ф壒娆″彿
+ // if (string.IsNullOrWhiteSpace(maxCode))
+ // {
+ // maxCodestr = toDayTime.Substring(2, 6) + "0001";
+ // }
+ // else
+ // {
+ // var lotStr = maxCode.Substring(0, 6);
+ // var timeStr = toDayTime.Substring(2, 6);
+ // if (lotStr == timeStr)
+ // {
+ // maxCodestr = toDayTime.Substring(2, 6) + (int.Parse(maxCode.Substring(6, 4)) + 1).ToString().PadLeft(4, '0');
+ // }
+ // else
+ // {
+ // maxCodestr = timeStr + "0001";
+ // }
+
+ // }
+ // }
+ // var sapNo = "";
+ // if (!string.IsNullOrWhiteSpace(list.OuterBillCode) && !string.IsNullOrWhiteSpace(list.SequenceNo))
+ // {
+ // sapNo = list.OuterBillCode + "-" + list.SequenceNo;
+ // }
+
+ // for (int i = 1; i <= labelNum; i++)
+ // {
+ // // 鐗╂枡鏉＄爜淇℃伅璧嬪��
+ // LabelPrint5Model model = new LabelPrint5Model();
+ // model.ImportId = imId;
+ // model.OuterBillCode = list.OuterBillCode;
+ // model.ImportBillCode = list.ImportBillCode;
+ // model.SkuNo = list.GoodsCode;
+ // model.SkuName = list.GoodsName;
+ // model.QtyCount = (int)bQNum; // 鎬讳欢鏁�
+
+ // model.SupplierName = supplierName; // 鐢熶骇鍘傚
+ // model.ProductionDate = productionDate; // 鐢熶骇鏃ユ湡
+ // model.SapSkuNo = sapNo; // SAP浠ｇ爜 SAP鍗曞彿+琛屽彿
+ // model.Standard = good.GoodsStandard; // 瑙勬牸
+ // model.SupplierLot = supplierLot; // 鍘傚鎵瑰彿
+
+ // model.LotNo = maxCodestr; //鎵规
+
+
+ // model.InspectTime = inspectTime; // 澶嶉獙鏈熻嚦
+ // model.ExpirationTime = expirationTime; // 鏈夋晥鏈熻嚦/璐瓨鏈�
+ // model.ExpirationType = good.GoodsTemp; // 璐瓨鏉′欢
+ // if (i == labelNum)
+ // {
+ // // 鏈�鍚庝竴涓潯鐮�
+ // var s = number * (i - 1);
+ // if (number > qty - s)
+ // {
+ // model.Qty = qty - s;// 鏁伴噺
+ // }
+ // else
+ // {
+ // model.Qty = number;// 鏁伴噺
+ // }
+ // }
+ // else
+ // {
+ // model.Qty = number; // 鏁伴噺
+ // }
+
+ // model.QtyOrd = i + diJiJian; // 绗嚑浠�
+
+ // if (maxboxcode == "")
+ // {
+ // var str = mesGood.PadRight(16, ' ') + model.LotNo.PadRight(12, ' ') + "0001";
+ // model.BoxCode = str; // 鏀彿 鎵瑰彿+绗嚑绠�
+ // maxboxcode = model.BoxCode;
+ // }
+ // else
+ // {
+ // model.BoxCode = maxboxcode.Substring(0, 28) + (int.Parse(maxboxcode.Substring(28, 4)) + 1).ToString().PadLeft(4, '0');
+ // maxboxcode = model.BoxCode;
+ // }
+ // model.imageStr = Utility.Extra.BarcodeHelper.GetQrCodeBase64(model.BoxCode, 85, 85);
+
+ // // 娣诲姞鍒發ist闆嗗悎
+ // printModel.Add(model);
+
+ // //if (number <= 0)
+ // //{
+ // // return printModel;
+ // //}
+ // var guid = Guid.NewGuid().ToString("N");
+ // // 灏嗘潯鐮佷繚瀛樺埌鍘熸枡鏉＄爜琛�
+ // var LabelModel = new LabelPrint
+ // {
+ // LabelID = guid,
+ // LabelStream = model.BoxCode,
+ // GoodsCode = model.SkuNo,
+ // GoodsName = model.SkuName,
+ // GoodsStandard = model.Standard,
+ // ImportLotNo = model.LotNo,
+ // SupplierName = model.SupplierName,
+ // ImportId = model.ImportId,
+ // OuterBillCode = model.OuterBillCode,
+ // ImportBillCode = model.ImportBillCode,
+ // ProductionDate = model.ProductionDate,
+ // SapSkuNo = model.SapSkuNo,
+ // Qty = model.Qty,
+ // SupplierLot = model.SupplierLot,
+ // InspectTime = model.InspectTime,
+ // ExpirationTime = model.ExpirationTime,
+ // QtyCount = model.QtyCount,
+ // QtyOrd = model.QtyOrd,
+ // ExpirationType = model.ExpirationType,
+ // BoxNum = number,// model.Qty,
+
+ // BulkTank = model.Qty == number ? 0 : 1,//闆跺ご绠�
+ // BulkCase = 0,//闆跺ご鐩�
+
+ // CreateUser = createUser,
+ // CreateTime = DateTime.Now,
+ // IsUse = 0
+ // };
+
+ // DataContext.LabelPrint.InsertOnSubmit(LabelModel);
+
+ // }
+ // DataContext.SubmitChanges();
+ // #endregion
+ // }
+ // else //(packLevel == 2)
+ // {
+ // #region 浜岀骇鍖呰
+
+ // // 鏍规嵁鐢ㄦ埛杈撳叆鐨勭鏁伴噺璁＄畻闇�瑕佺殑鏉＄爜鏁�
+ // var labQty = labelData.Sum(m => m.Qty);
+ // var qty2 = Convert.ToDecimal(list.ImportQuantity) - (decimal)labQty;
+ // if (qty2 <= 0)
+ // {
+ // throw new Exception("褰撳墠鍗曟嵁鐗╂枡鏍囩宸叉墦鍗板畬姣曪紝濡傛湁闇�瑕佽琛ユ墦");
+ // }
+
+ // #region 澧炲姞鍒拌揣鏁伴噺
+ // if (skuNum != "")
+ // {
+ // if (qty2 - Convert.ToDecimal(skuNum) < 0)
+ // {
+ // throw new Exception("鍒拌揣鏁伴噺澶т簬鏈墦鏍囩鏁伴噺锛岃閲嶆柊杈撳叆鍒拌揣鏁伴噺!");
+ // }
+ // else
+ // {
+ // qty2 = Convert.ToDecimal(skuNum);
+ // }
+ // }
+ // #endregion
+
+ // int labelNum2 = 1; //鐢熶骇绠辨潯鐮佹暟閲�
+
+ // labelNum2 = int.Parse(Math.Ceiling(qty2 / bNum).ToString());
+
+ // if (bQNum >= 1)//鎵撳嵃鏍囩鏁伴噺鏄惁澶т簬1 (鏈夋墦鍗版爣绛炬暟閲�)
+ // {
+ // if (bQNum > 100)
+ // {
+ // throw new Exception("鎵撳嵃鏍囩鏁伴噺寤鸿鍦�100寮犱互鍐�");
+ // }
+ // if (bQNum < labelNum2) //鎵撳嵃鐨勬爣绛炬暟閲忓ぇ浜庣瓑浜庡墿浣欒兘鎵撳嵃鐨勫紶鏁伴噺
+ // {
+ // labelNum2 = (int)bQNum;
+ // }
+ // }
+
+ // //var bCount = Math.Floor(qty2 / bNum); //鏁寸鐨勬暟閲�
+ // //var zCount = qty2 - bCount* bNum; //鍓╀綑鏁伴噺
+
+ // var ss = bNum / zNum; //姣忕鏀爣绛炬暟閲�
+ // var labelNumZ2 = Math.Ceiling((decimal)ss);
+
+ // if (labelNum2 * labelNumZ2 > 100)
+ // {
+ // if (labelNumZ2 <= 100)
+ // {
+ // labelNum2 = (int)Math.Floor((decimal)(100 / labelNumZ2));
+ // }
+ // else
+ // {
+ // labelNum2 = 1;
+ // }
+ // }
+
+ // string maxCodestr2 = ""; //鎵规
+ // string maxboxcode2 = ""; //绠辩爜
+ // string maxboxcode3 = ""; //鏀爜
+ // // 鐢熸垚鑷紪鎵瑰彿
+ // string toDayTime2 = DateTime.Now.ToString("yyyyMMdd");
+ // var diJiJian = 0;
+ // if (isPrint == "0")
+ // {
+ // var maxCode = DataContext.LabelPrint.Where(b => b.ImportId == imId).ToList().Max(a => a.ImportLotNo);
+ // var boxCode1 = DataContext.LabelPrint.Where(b => b.ImportId == imId).ToList().Max(a => a.LabelStream);
+ // var boxCode2 = DataContext.LabelPrint.Where(b => b.ImportId == imId).ToList().Max(a => a.BoxCode1);//鏀彿
+ // maxCodestr2 = maxCode;
+ // maxboxcode2 = boxCode1;
+ // maxboxcode3 = boxCode2;
+ // if (string.IsNullOrWhiteSpace(maxCodestr2))
+ // {
+ // maxCodestr2 = toDayTime2.Substring(2, 6) + "0001";
+ // }
+ // else
+ // {
+ // var q = DataContext.LabelPrint
+ // .Where(m => m.ImportId == imId && m.ImportLotNo == maxCodestr2)
+ // .GroupBy(m => m.LabelStream).ToList();
+ // diJiJian = q.Count;
+ // }
+ // }
+ // else
+ // {
+ // var maxCode = DataContext.LabelPrint.Max(a => a.ImportLotNo); // 鑾峰彇浠婂ぉ鏈�澶ф壒娆″彿
+ // if (string.IsNullOrWhiteSpace(maxCode))
+ // {
+ // maxCodestr2 = toDayTime2.Substring(2, 6) + "0001";
+ // }
+ // else
+ // {
+ // var lotStr = maxCode.Substring(0, 6);
+ // var timeStr = toDayTime2.Substring(2, 6);
+ // if (lotStr == timeStr)
+ // {
+ // maxCodestr2 = timeStr + (int.Parse(maxCode.Substring(6, 4)) + 1).ToString().PadLeft(4, '0');
+ // }
+ // else
+ // {
+ // maxCodestr2 = timeStr + "0001";
+ // }
+
+ // }
+ // }
+ // var sapNo = "";
+ // if (!string.IsNullOrWhiteSpace(list.OuterBillCode) && !string.IsNullOrWhiteSpace(list.SequenceNo))
+ // {
+ // sapNo = list.OuterBillCode + "-" + list.SequenceNo;
+ // }
+ // for (int i = 1; i <= labelNum2; i++)//绠辩爜鏍囩
+ // {
+ // // 鐗╂枡鏉＄爜淇℃伅璧嬪��
+ // LabelPrint5Model model = new LabelPrint5Model();
+ // model.ImportId = imId;
+ // model.OuterBillCode = list.OuterBillCode;
+ // model.ImportBillCode = list.ImportBillCode;
+ // model.SkuNo = list.GoodsCode;
+ // model.SkuName = list.GoodsName;
+ // model.QtyCount = (int)bQNum; // 鎬讳欢鏁�
+
+ // model.SupplierName = supplierName; // 鐢熶骇鍘傚
+ // model.ProductionDate = productionDate; // 鐢熶骇鏃ユ湡
+ // model.SapSkuNo = sapNo; // SAP浠ｇ爜
+ // model.Standard = good.GoodsStandard; // 瑙勬牸
+ // model.SupplierLot = supplierLot; // 鍘傚鎵瑰彿
+
+ // model.LotNo = maxCodestr2; //鎵规
+
+
+ // model.InspectTime = inspectTime; // 澶嶉獙鏈熻嚦
+ // model.ExpirationTime = expirationTime; // 鏈夋晥鏈熻嚦/璐瓨鏈�
+ // model.ExpirationType = good.GoodsTemp; // 璐瓨鏉′欢
+ // if (i == labelNum2)
+ // {
+ // // 鏈�鍚庝竴涓潯鐮�
+ // var s = bNum * (i - 1);
+ // if (bNum > qty2 - s)
+ // {
+ // model.Qty = qty2 - s;// 鏁伴噺
+ // }
+ // else
+ // {
+ // model.Qty = bNum;// 鏁伴噺
+ // }
+ // }
+ // else
+ // {
+ // model.Qty = bNum; // 鏁伴噺
+ // }
+
+ // model.QtyOrd = i + diJiJian; // 绗嚑浠�
+ // if (maxboxcode2 == "")
+ // {
+ // maxboxcode2 = "B" + model.LotNo + i.ToString().PadLeft(5, '0');
+ // model.BoxCode = maxboxcode2; // 绠卞彿 鎵瑰彿+绗嚑绠�
+ // }
+ // else
+ // {
+ // maxboxcode2 = maxboxcode2.Substring(0, 11) + (int.Parse(maxboxcode2.Substring(11, 5)) + 1).ToString().PadLeft(5, '0');
+ // model.BoxCode = maxboxcode2;
+ // }
+ // model.imageStr = Utility.Extra.BarcodeHelper.GetQrCodeBase64(model.BoxCode, 85, 85);
+
+ // // 娣诲姞鍒發ist闆嗗悎
+ // printModel.Add(model);
+
+ // if (i == labelNum2)
+ // {
+ // var isGo2 = false;
+ // var sl = 0;
+ // for (int j = 1; j <= labelNumZ2; j++)
+ // {
+ // if (isGo2)
+ // {
+ // break;
+ // }
+ // var d = zNum;
+ // if (i == labelNum2)
+ // {
+ // var s = bNum * (i - 1);
+ // var s2 = zNum * (j - 1);
+ // if (zNum >= qty2 - s - s2)
+ // {
+ // d = (int)(qty2 - s - s2); // 鏁伴噺
+ // isGo2 = true;
+ // }
+ // }
+ // sl++;
+ // }
+ // labelNumZ2 = sl;
+ // }
+
+ // for (int j = 1; j <= labelNumZ2; j++)//鏈�灏忓崟浣嶆爣绛�
+ // {
+ // if (isGo)
+ // {
+ // break;
+ // }
+ // var d = zNum;
+ // if (i == labelNum2)
+ // {
+ // var s = bNum * (i - 1);
+ // var s2 = zNum * (j - 1);
+ // if (zNum >= qty2 - s - s2)
+ // {
+ // d = (int)(qty2 - s - s2); // 鏁伴噺
+ // isGo = true;
+ // }
+ // }
+ // // 鐗╂枡鏉＄爜淇℃伅璧嬪��
+ // LabelPrint5Model model2 = new LabelPrint5Model();
+ // model2.ImportId = imId;
+ // model2.OuterBillCode = list.OuterBillCode;
+ // model2.ImportBillCode = list.ImportBillCode;
+ // model2.SkuNo = list.GoodsCode;
+ // model2.SkuName = list.GoodsName;
+ // model2.QtyCount = (int)labelNumZ2; // 鎬讳欢鏁�(int)labelNumZ2
+
+ // model2.SupplierName = supplierName; // 鐢熶骇鍘傚
+ // model2.ProductionDate = productionDate; // 鐢熶骇鏃ユ湡
+ // model2.SapSkuNo = sapNo; // SAP浠ｇ爜
+ // model2.Standard = good.GoodsStandard; // 瑙勬牸
+ // model2.SupplierLot = supplierLot; // 鍘傚鎵瑰彿
+
+ // model2.LotNo = maxCodestr2; //鎵规
+
+
+ // model2.InspectTime = inspectTime; // 澶嶉獙鏈熻嚦
+ // model2.ExpirationTime = expirationTime; // 鏈夋晥鏈熻嚦/璐瓨鏈�
+ // model2.ExpirationType = good.GoodsTemp; // 璐瓨鏉′欢
+ // model2.Qty = d; // 鏁伴噺
+
+ // model2.QtyOrd = j; // 绗嚑浠�
+ // if (maxboxcode3 == "")
+ // {
+ // var str = mesGood.PadRight(16, ' ') + model.LotNo.PadRight(12, ' ') + "0001";
+ // model2.BoxCode = str; // 鏀彿 鎵瑰彿+绗嚑绠�
+ // maxboxcode3 = model2.BoxCode;
+ // }
+ // else
+ // {
+ // model2.BoxCode = maxboxcode3.Substring(0, 28) + (int.Parse(maxboxcode3.Substring(28, 4)) + 1).ToString().PadLeft(4, '0');
+ // maxboxcode3 = model2.BoxCode;
+ // }
+
+ // model2.imageStr = Utility.Extra.BarcodeHelper.GetQrCodeBase64(model2.BoxCode, 85, 85);
+ // // 娣诲姞鍒發ist闆嗗悎
+
+ // if (printModel.Count(m => m.BoxCode.Length > 17) <= 100)//鎺掗櫎寰呯鐮佸垽鏂敮鐮佹槸鍚﹀皬浜�100
+ // {
+ // printModel.Add(model2);
+ // }
+ // var guid = Guid.NewGuid().ToString("N");
+ // // 灏嗘潯鐮佷繚瀛樺埌鍘熸枡鏉＄爜琛�
+ // var LabelModel2 = new LabelPrint
+ // {
+ // LabelID = guid,
+ // LabelStream = model.BoxCode,
+ // BoxCode1 = model2.BoxCode,
+ // GoodsCode = model2.SkuNo,
+ // GoodsName = model2.SkuName,
+ // GoodsStandard = model2.Standard,
+ // ImportLotNo = model2.LotNo,
+ // SupplierName = model2.SupplierName,
+ // ImportId = model2.ImportId,
+ // OuterBillCode = model2.OuterBillCode,
+ // ImportBillCode = model2.ImportBillCode,
+ // ProductionDate = model2.ProductionDate,
+ // SapSkuNo = model2.SapSkuNo,
+ // Qty = model2.Qty,
+ // SupplierLot = model2.SupplierLot,
+ // InspectTime = model2.InspectTime,
+ // ExpirationTime = model2.ExpirationTime,
+ // QtyCount = model2.QtyCount,
+ // QtyOrd = model2.QtyOrd,
+ // ExpirationType = model2.ExpirationType,
+ // BoxNum = bNum,//model.Qty,
+
+ // BulkTank = model.Qty == bNum ? 0 : 1,//闆跺ご绠�
+ // BulkCase = 0,//闆跺ご鐩�
+
+ // CreateUser = createUser,
+ // CreateTime = DateTime.Now,
+ // IsUse = 0
+ // };
+
+ // DataContext.LabelPrint.InsertOnSubmit(LabelModel2);
+ // }
+
+
+ // }
+ // DataContext.SubmitChanges();
+
+ // #endregion
+ // }
+
+ // return printModel;
+ // }
+ // }
+ // catch (Exception ex)
+ // {
+ // throw new Exception(ex.Message);
+ // }
+ //}
+
+
}
}
diff --git a/Wms/WMS.Entity/BllAsnEntity/BllLabelBoxNo.cs b/Wms/WMS.Entity/BllAsnEntity/BllLabelBoxNo.cs
index c9a9ccf..a3311e5 100644
--- a/Wms/WMS.Entity/BllAsnEntity/BllLabelBoxNo.cs
+++ b/Wms/WMS.Entity/BllAsnEntity/BllLabelBoxNo.cs
@@ -61,6 +61,27 @@
public string SkuName { get; set; }
/// <summary>
+ /// Desc:鐗╂枡瑙勬牸
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string Standard { get; set; }
+
+ /// <summary>
+ /// Desc:鍖呰瑙勬牸
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string PackageStandard { get; set; }
+
+ /// <summary>
+ /// Desc:鍌ㄥ瓨鏈熻嚦
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public DateTime? StoreTime { get; set; }
+
+ /// <summary>
/// Desc:鎵规鍙�
/// Default:
/// Nullable:True
diff --git a/Wms/WMS.IBLL/IBllAsnServer/IBllLabelBoxNoServer.cs b/Wms/WMS.IBLL/IBllAsnServer/IBllLabelBoxNoServer.cs
index be6e45b..07bcd20 100644
--- a/Wms/WMS.IBLL/IBllAsnServer/IBllLabelBoxNoServer.cs
+++ b/Wms/WMS.IBLL/IBllAsnServer/IBllLabelBoxNoServer.cs
@@ -16,5 +16,13 @@
/// <param name="count">鏁伴噺</param>
/// <returns>鏍囩绠辩爜淇℃伅</returns>
List<LabelBoxDto> GetLabelBoxList(LabelBoxVm model, out int count);
+
+ /// <summary>
+ /// 鑾峰彇鏍囩妯℃澘鏍规嵁鍏ュ簱鍗曟槑缁咺D
+ /// </summary>
+ /// <param name="id">鍏ュ簱鍗曟槑缁咺D</param>
+ /// <returns>鏍囩淇℃伅妯℃澘</returns>
+ LabelBoxDto GetLabelBoxModel(int id);
+
}
}
diff --git a/Wms/Wms/Controllers/BllAsnController.cs b/Wms/Wms/Controllers/BllAsnController.cs
index 081f183..fee616f 100644
--- a/Wms/Wms/Controllers/BllAsnController.cs
+++ b/Wms/Wms/Controllers/BllAsnController.cs
@@ -862,6 +862,21 @@
}
}
+ [HttpGet]
+ public IActionResult GetLabelBoxModel(int id)
+ {
+ try
+ {
+ var list = _labelBox.GetLabelBoxModel(id);
+ return Ok(new { code = 0, msg = "绠辩爜妯℃澘淇℃伅", data = list });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+
+
#endregion
}
--
Gitblit v1.8.0