From b5eec4dc738e4abc20c652c041fa7b17ba0e636f Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期一, 19 二月 2024 09:37:46 +0800
Subject: [PATCH] Merge branch 'csc'
---
HTML/views/ASNSetting/LabelBoxBuDa.html | 10 +++++-----
Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs | 9 +++------
HTML/views/ASNSetting/ArrivalNotice.html | 2 +-
HTML/views/ASNSetting/LabelPrint.html | 12 ++++++------
HTML/views/ASNSetting/LabelPrintSelect.html | 2 +-
5 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 3c4ae48..4a21c98 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -1201,7 +1201,7 @@
console.log(field);
//鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
//"&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;
+ var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime;
layer.open({
type: 2,
diff --git a/HTML/views/ASNSetting/LabelBoxBuDa.html b/HTML/views/ASNSetting/LabelBoxBuDa.html
index 77d3981..976df1c 100644
--- a/HTML/views/ASNSetting/LabelBoxBuDa.html
+++ b/HTML/views/ASNSetting/LabelBoxBuDa.html
@@ -190,7 +190,7 @@
GetImportId();
});
form.on('select(Type)', function (data) {
- console.log(data.value); //寰楀埌琚�変腑鐨勫��
+ // console.log(data.value); //寰楀埌琚�変腑鐨勫��
if (data.value == "1") {
$("#LabelStream").removeAttr("readonly")
$("#EndBoxCode").removeAttr("readonly")
@@ -226,14 +226,14 @@
synData(IP + "/BllAsn/GetBuDaLabelList", param1, 'post', function (res) {
if (res.code == 0) { //鎴愬姛
var labels = "";
- console.log(res.data);
+ // 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);
+ // console.log(res.data[z]);
+ // console.log(z);
$("#SkuNo").attr("id", "SkuNo" + z.toString());
$("#SkuNo" + z.toString()).html(res.data[z].SkuNo);
@@ -303,7 +303,7 @@
$("#imgBar" + z.toString()).attr("id", "imgBar");
$("#imgBar").attr("src", "");
}
- console.log(labels);
+ // console.log(labels);
document.getElementById('print2').innerHTML = "";
document.getElementById('print2').innerHTML = labels;
$("#print2").removeClass("hideCls");
diff --git a/HTML/views/ASNSetting/LabelPrint.html b/HTML/views/ASNSetting/LabelPrint.html
index 974caae..7c4577e 100644
--- a/HTML/views/ASNSetting/LabelPrint.html
+++ b/HTML/views/ASNSetting/LabelPrint.html
@@ -112,16 +112,16 @@
var laydate = layui.laydate;
var id = getQueryString('Id');
- var reset = getQueryString('Reset');
+ var reset = getQueryString('IsReset');
var arriveQty = getQueryString('ArriveQty');
var productionTime = getQueryString('ProductionTime');
var expirationTime = getQueryString('ExpirationTime');
var storeTime = getQueryString('StoreTime');
- console.log(productionTime);
- console.log(expirationTime);
- console.log(storeTime);
+ // console.log(productionTime);
+ // console.log(expirationTime);
+ // console.log(storeTime);
//鐢熸垚
$('#btnAdd').on('click', function () {
@@ -133,7 +133,7 @@
ExpirationTime:expirationTime,
StoreTime:storeTime
};
- console.log(param);
+ // console.log(param);
synData(IP + "/BllAsn/AddLabelBox", param , 'post', function (res) {
if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
@@ -189,7 +189,7 @@
}
- // 寰幆鍔犺浇鏍囩
+ // 鍔犺浇鏍囩
function div(i, isprint, bqNum) {
var param1 = {
diff --git a/HTML/views/ASNSetting/LabelPrintSelect.html b/HTML/views/ASNSetting/LabelPrintSelect.html
index 8e9281d..b8a6829 100644
--- a/HTML/views/ASNSetting/LabelPrintSelect.html
+++ b/HTML/views/ASNSetting/LabelPrintSelect.html
@@ -32,7 +32,7 @@
<div class="layui-form-item">
<label class="layui-form-label">閲嶇疆鎵瑰彿</label>
<div class="layui-input-block">
- <select name="reset" id="reset" lay-verify="required">
+ <select name="reset" id="reset" lay-filter="reset" lay-verify="required">
<option value="1">鏄�</option>
<option value="0">鍚�</option>
</select>
diff --git a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
index e05c647..32b82ca 100644
--- a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
@@ -672,7 +672,7 @@
}
else
{
- var maxCode = Db.Queryable<BllLabelBoxNo>().Max(a => a.LotNo); // 鑾峰彇浠婂ぉ鏈�澶ф壒娆″彿
+ var maxCode = Db.Queryable<BllBoxInfo>().Where(m=>m.Origin == "WMS鐢熸垚").Max(a => a.LotNo); // 鑾峰彇浠婂ぉ鏈�澶ф壒娆″彿
if (string.IsNullOrWhiteSpace(maxCode))
{
maxLotNoStr = toDayTime.Substring(2, 6) + "0001";
@@ -819,7 +819,7 @@
}
else
{
- var maxCode = Db.Queryable<BllLabelBoxNo>().Max(a => a.LotNo); // 鑾峰彇浠婂ぉ鏈�澶ф壒娆″彿
+ var maxCode = Db.Queryable<BllBoxInfo>().Where(m => m.Origin == "WMS鐢熸垚").Max(a => a.LotNo); // 鑾峰彇浠婂ぉ鏈�澶ф壒娆″彿
if (string.IsNullOrWhiteSpace(maxCode))
{
maxCodestr2 = toDayTime2.Substring(2, 6) + "0001";
@@ -1512,7 +1512,7 @@
model1.Qty = item.Qty;// 鏁伴噺
model1.BoxNo = item.BoxNo3; // 鏀彿
- model.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 160, 40, false);
+ model1.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 160, 40, false);
// 娣诲姞鍒發ist闆嗗悎
printModelList.Add(model1);
@@ -1543,9 +1543,6 @@
#endregion
- //dataContext.WmsLabelPrintLog.InsertAllOnSubmit(printlog);
- // dataContext.SubmitChanges();
- // return printModel;
return printModelList;
}
catch (Exception e)
--
Gitblit v1.8.0