From 7a5f2b3bdb3346c6a2d73aeacdb58c8e366606ea Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期一, 04 三月 2024 16:04:28 +0800
Subject: [PATCH] Merge branch 'yyk'
---
HTML/views/ASNSetting/ArrivalNoticeDetail.html | 1
HTML/views/ASNSetting/SelMaterials.html | 1
Wms/WMS.Entity/DataEntity/DataStockDetail.cs | 7 +
Pda/View/AsnSetting/productEnterQuantity.html | 63 ++++++++++++
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 2
Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs | 3
Wms/Model/ModelVm/PdaVm/PdaAsnVm.cs | 5 +
Wms/Wms/Controllers/PdaAsnController.cs | 27 +++++
HTML/views/SOSetting/ExportNotice.html | 8 +
Wms/WMS.Entity/BllAsnEntity/BllPalletBind.cs | 7 +
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 145 +++++++++++++++++++++-------
11 files changed, 223 insertions(+), 46 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNoticeDetail.html b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
index 068f453..a01103b 100644
--- a/HTML/views/ASNSetting/ArrivalNoticeDetail.html
+++ b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
@@ -439,6 +439,7 @@
active = {
add: function () {
var typeValue = $("#Type").val();
+ console.log(typeValue)
layer.open({
type: 2,
title: '娣诲姞鏄庣粏',
diff --git a/HTML/views/ASNSetting/SelMaterials.html b/HTML/views/ASNSetting/SelMaterials.html
index 54ae688..8e0d04a 100644
--- a/HTML/views/ASNSetting/SelMaterials.html
+++ b/HTML/views/ASNSetting/SelMaterials.html
@@ -32,6 +32,7 @@
<option value="4">杞﹂棿浣欐枡閫�鍥炲叆搴�</option>
<option value="5">鍏跺畠鍏ュ簱</option>
<option value="6">浠ｅ偍鍏ュ簱</option>
+ <option value="7">瀵勫瓨鍏ュ簱</option>
</select>
</div>
</div>
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index 5706555..a4f6dd1 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -336,9 +336,11 @@
var html = '';
if(d.IsWave == '0'){
if(d.Status == '0' || d.Status == '1' ){
- html += `<a class="layui-btn layui-btn-normal layui-btn-xs zifenClass" lay-event="auto">
- <i class="layui-icon layui-icon-ok"></i>鑷姩鍒嗛厤
- </a>`;
+ if(d.type != "8") {
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs zifenClass" lay-event="auto">
+ <i class="layui-icon layui-icon-ok"></i>鑷姩鍒嗛厤
+ </a>`;
+ }
}
if(d.Status == '0' && d.Origin == 'WMS'){
html += `<a class="layui-btn layui-btn-normal layui-btn-xs uptClass" lay-event="edit">
diff --git a/Pda/View/AsnSetting/productEnterQuantity.html b/Pda/View/AsnSetting/productEnterQuantity.html
index 63d7c5f..f9fd720 100644
--- a/Pda/View/AsnSetting/productEnterQuantity.html
+++ b/Pda/View/AsnSetting/productEnterQuantity.html
@@ -219,7 +219,7 @@
</form>
</div>
- <br>
+ <!-- <br> -->
<div id="" class="cut-line">
<img src="/assets/fengexian.png">
@@ -339,6 +339,22 @@
</table>
+ <!-- <div id="demodiv" class="layui-form-item layout-input">
+ <label class="layui-form-label" lang>瀵勫瓨澶囨敞锛�</label>
+ <div class="layui-input-block">
+ <textarea placeholder="璇疯緭鍏ュ唴瀹�" id="Demo" name="Demo" class="layui-textarea" ></textarea>
+
+ </div>
+ </div> -->
+ <!-- 缁存姢澶囨敞寮规 -->
+ <div id="demodiv" class="layui-form-item layout-input" style="height: auto;">
+ <label class="layui-form-label">瀵勫瓨澶囨敞锛�</label>
+ <div class="layui-input-inline" style="width: 365px;height: auto;">
+ <textarea placeholder="璇疯緭鍏ュ唴瀹�" id="NoticeDemo" name="NoticeDemo" class="layui-textarea" ></textarea>
+ </div>
+ <br>
+ </div>
+
<table class="layout-tbl-submit" border="" cellspacing="" cellpadding="">
<tr>
<td style="width: 23%;"></td>
@@ -355,6 +371,11 @@
</div>
<br>
+ <br>
+ <div id="demodiv1">
+ <br><br><br><br><br><br><br>
+ </div>
+
<div id="" class="cut-line">
<img src="/assets/fengexian.png">
@@ -409,7 +430,8 @@
var form = layui.form
/* 鏍囩鍒囨崲浠ｇ爜 */
-
+ $('#demodiv').hide();
+ $('#demodiv1').hide();
var xianshiyemian = 0;
$('#option1').attr("style", "background-color: aqua;width: 45.77%;float: left;text-align: center;"); //閫変腑鍚庨鑹�
@@ -431,7 +453,8 @@
xianshiyemian = 1;
$('#content1').hide();
$('#option1').attr("style", "background-color: #999;width: 45.77%;float: left;text-align: center;"); //榛樿棰滆壊
-
+
+
$('#content2').show();
$('#option2').attr("style", "background-color: aqua;width: 45.77%;float: right;text-align: center;"); //閫変腑鍚庨鑹�
@@ -652,6 +675,7 @@
});
//閫変腑鍏ュ簱鍗曚簨浠�-鏁伴噺
form.on('select(getbar1)', function (data) {
+ updateDemoDiv();
updateGoodList()
setOrderGoods();
});
@@ -758,6 +782,7 @@
AsnDetailId: parseInt($("#goodSelect1").val()), //鍏ュ簱鍗曟槑缁咺D
LotNo: $("#goodSelect1").find("option:selected").text(), //鐗╂枡鎵规
SkuQty: parseInt($("#SkuQty").val()), //鐗╂枡鏁伴噺
+ Demo: $("#NoticeDemo").val(), //鐗╂枡鏁伴噺
Origin: "PDA"
}
@@ -788,6 +813,35 @@
return false; //闃绘琛ㄥ崟璺宠浆銆傚鏋滈渶瑕佽〃鍗曡烦杞紝鍘绘帀杩欐鍗冲彲銆�
});
+
+ // 鏍规嵁鍏ュ簱鍗曞彿 鑾峰彇澶囨敞鏄惁鏄剧ず鍙婂娉ㄤ俊鎭�
+ function updateDemoDiv() {
+ var param = {
+ AsnNo: $("#bar1").val(),
+ };
+ synData(IP + "/PdaAsn/GetArrivalNotice", param, 'post', function (res) {
+ console.log(res)
+ if (res.code == 0 && res.data != null) { //鎴愬姛
+
+ //鍒ゆ柇榛樿閫変腑鏄惁涓哄瘎瀛樼墿鏂�
+ if(res.data[0].Type == "7")
+ {
+ $("textarea[name='NoticeDemo']").val(res.data[0].Demo); //澶囨敞
+ $('#demodiv').show();
+ $('#demodiv1').show();
+ }
+ else
+ {
+ $('#demodiv').hide();
+ $('#demodiv1').hide();
+ }
+ }
+ else{
+ $('#demodiv').hide();
+ $('#demodiv1').hide();
+ }
+ });
+ }
// 鏍规嵁鍏ュ簱鏄庣粏ID 鑾峰彇璇︾粏淇℃伅
function setOrderGoods() {
@@ -825,6 +879,7 @@
$("#Standard1").val(res.data.Standard);
$("#ImportFactQuantity1").val(res.data.FactQty + "");
}
+ else{}
});
}
@@ -914,6 +969,7 @@
asnDetails = res.data;
for (var i = 0; i < res.data.length; i++) {
if (skuNo != '' && skuNo == res.data[i].SkuNo) {
+
if (i == 0) {
$("#goodSelect1").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
.SkuName);
@@ -947,6 +1003,7 @@
$('#goodSelect1').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
}
} else {
+
}
});
}
diff --git a/Wms/Model/ModelVm/PdaVm/PdaAsnVm.cs b/Wms/Model/ModelVm/PdaVm/PdaAsnVm.cs
index 7d734a0..f7681c0 100644
--- a/Wms/Model/ModelVm/PdaVm/PdaAsnVm.cs
+++ b/Wms/Model/ModelVm/PdaVm/PdaAsnVm.cs
@@ -69,5 +69,10 @@
/// Desc:鎵规鍙�
/// </summary>
public string LotNo { get; set; }
+
+ /// <summary>
+ /// Desc:澶囨敞
+ /// </summary>
+ public string Demo { get; set; }
}
}
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index f08c74b..9a39155 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -177,7 +177,7 @@
skuType = "(4)";
break;
case "7"://瀵勫瓨鍏ュ簱
- skuType = "(0,1,2,3,4)";
+ skuType = "(3)";
break;
default: //鍏跺畠
skuType = "(0,1,2,3,4)";
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index b0ba6db..5afee30 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -42,6 +42,23 @@
}
}
+ //鏍规嵁鍏ュ簱鍗曞彿鑾峰彇鍏ュ簱鎬诲崟淇℃伅
+ public List<BllArrivalNotice> GetArrivalNotice(ArrivalNoticeVm model)
+ {
+ string sqlString = string.Empty;
+ try
+ {
+ sqlString = $"select * from BllArrivalNotice where ASNNo = '{model.ASNNo}' and isdel='0' ";
+ var modelList = Db.Ado.SqlQuery<BllArrivalNotice>(sqlString);
+
+ return modelList;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
// 鏍规嵁鍗曟嵁鍙疯幏鍙栧崟鎹槑缁嗗垪琛�
public List<ArrivalNoticeDetailDto> GetArrivalNoticeDetails(ArrivalNoticeVm model)
{
@@ -1286,7 +1303,7 @@
/// </summary>
/// <param name="locatNo">鍌ㄤ綅缂栫爜</param>
/// <returns></returns>
- public string CheckLocatNo(string locatNo)
+ public string CheckLocatNo(string locatNo)
{
try
{
@@ -1810,6 +1827,52 @@
}
}
+ int isDeposit = 0;
+ //鍒ゆ柇鎬诲崟鍗曟嵁鏄惁涓哄瘎瀛樺崟鎹�
+ if (notice.Type == "7")
+ {
+ isDeposit = 1;
+ }
+ if (isDeposit == 1)
+ {
+ //鍒ゆ柇鎬诲崟澶囨敞鏄惁涓虹┖
+ if (!string.IsNullOrWhiteSpace(notice.Demo))
+ {
+ //鍒嗗壊鎬诲崟澶囨敞鍙婃墭鐩樺娉�
+ var noticeDemo = notice.Demo.Split('銆�'); //鎬诲崟澶囨敞
+ var palletDemo = model.Demo.Split('銆�'); //鎵樼洏澶囨敞
+
+ //寰幆鎵樼洏澶囨敞
+ foreach (var itemPallet in palletDemo)
+ {
+ int isDemo = 0;
+ //寰幆鎬诲崟澶囨敞
+ foreach (var itemNotice in noticeDemo)
+ {
+ //鍒ゆ柇鏄惁鏈夌浉鍚屽娉�
+ if (itemPallet == itemNotice)
+ {
+ isDemo = 1;
+ break;
+ }
+ }
+ if (isDemo == 0)
+ {
+ throw new Exception("-1:鎬诲崟澶囨敞涓庢墭鐩樺娉ㄤ笉绗︼紝璇锋牳瀹炲悗閲嶆柊缁戝畾!");
+ }
+ }
+ }
+ else if (string.IsNullOrWhiteSpace(notice.Demo))
+ {
+ //鍒ゆ柇鎵樼洏澶囨敞鏄惁涓虹┖
+ if (!string.IsNullOrWhiteSpace(model.Demo))
+ {
+ throw new Exception("-1:璇锋坊鍔犳�诲崟澶囨敞鍚庤緭鍏ユ墭鐩樺娉�!");
+ }
+ }
+ }
+
+
#endregion
Db.BeginTran();
@@ -1836,40 +1899,46 @@
var package = Db.Queryable<SysPackag>().Where(m => m.IsDel == "0");
var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == detail.SkuNo);
var pack = package.First(m => m.IsDel == "0" && m.PackagNo == sku.PackagNo);
- if (pack == null)
- {
- throw new Exception("-1:鑾峰彇鐗╂枡鍖呰澶辫触锛岃鏍稿疄!");
- }
+
var pNum = 0;//鎵樼洏鐗╁搧鏁伴噺
var bNum = 0;//绠辩爜鐗╁搧鏁伴噺
- if (pack.L5Num.HasValue)
+
+ //鍒ゆ柇鏄惁涓哄瘎瀛樼墿鏂�
+ if (isDeposit == 0)
{
- pNum = (int)pack.L5Num;
- bNum = (int)pack.L4Num;
- }
- else if (pack.L4Num.HasValue)
- {
- pNum = (int)pack.L4Num;
- bNum = (int)pack.L3Num;
- }
- else if (pack.L3Num.HasValue)
- {
- pNum = (int)pack.L3Num;
- bNum = (int)pack.L2Num;
- }
- else if (pack.L2Num.HasValue)
- {
- pNum = (int)pack.L2Num;
- bNum = (int)pack.L1Num;
- }
- else if (pack.L1Num.HasValue)
- {
- pNum = (int)pack.L1Num;
- bNum = (int)pack.L1Num;
- }
- if (pNum == 0 || bNum == 0)
- {
- throw new Exception($"缁戝畾澶辫触锛寋detail.SkuNo}鐗╁搧鍖呰鏈壘鍒帮紒");
+ if (pack == null)
+ {
+ throw new Exception("-1:鑾峰彇鐗╂枡鍖呰澶辫触锛岃鏍稿疄!");
+ }
+ if (pack.L5Num.HasValue)
+ {
+ pNum = (int)pack.L5Num;
+ bNum = (int)pack.L4Num;
+ }
+ else if (pack.L4Num.HasValue)
+ {
+ pNum = (int)pack.L4Num;
+ bNum = (int)pack.L3Num;
+ }
+ else if (pack.L3Num.HasValue)
+ {
+ pNum = (int)pack.L3Num;
+ bNum = (int)pack.L2Num;
+ }
+ else if (pack.L2Num.HasValue)
+ {
+ pNum = (int)pack.L2Num;
+ bNum = (int)pack.L1Num;
+ }
+ else if (pack.L1Num.HasValue)
+ {
+ pNum = (int)pack.L1Num;
+ bNum = (int)pack.L1Num;
+ }
+ if (pNum == 0 || bNum == 0)
+ {
+ throw new Exception($"缁戝畾澶辫触锛寋detail.SkuNo}鐗╁搧鍖呰鏈壘鍒帮紒");
+ }
}
#endregion
@@ -1910,9 +1979,11 @@
BitPalletMark = "1",
IsBale = "0",
IsBelt = "0",
- CreateUser = userId
+ CreateUser = userId,
+ Demo = model.Demo,
+
};
- if (model.SkuQty > pNum)
+ if (model.SkuQty > pNum && isDeposit == 0)
{
throw new Exception($"缁戝畾澶辫触锛寋model.PalletNo}鎵樼洏缁戝畾鏁伴噺澶т簬璇ョ墿鍝佹墭鐩樺寘瑁呮暟閲忥紒");
}
@@ -2002,7 +2073,7 @@
// 鏇存柊鎵樼洏缁戝畾琛�
bind.Qty += factQty;
}
- if (bind.FullQty < bind.Qty)
+ if (bind.FullQty < bind.Qty && isDeposit == 0)
{
throw new Exception("鎵樼洏缁戝畾鏁伴噺宸茶秴鍑鸿鐗╂枡鍖呰鏁伴噺");
}
@@ -2011,7 +2082,7 @@
{
bind.BitPalletMark = "0";
}
- if (bind.Qty > pNum)
+ if (bind.Qty > pNum && isDeposit == 0)
{
throw new Exception($"缁戝畾澶辫触锛寋bind.PalletNo}鎵樼洏缁戝畾鏁伴噺澶т簬璇ョ墿鍝佹墭鐩樺寘瑁呮暟閲忥紒");
}
@@ -2155,7 +2226,7 @@
{
// 涓嶈创鐮佺墿鏂� 鏃犻渶楠岃瘉绠辩爜淇℃伅
}
- else
+ else
{
//楠岃瘉绠辩爜淇℃伅鏄惁瀛樺湪
if (boxInfoList.Count <= 0)
diff --git a/Wms/WMS.Entity/BllAsnEntity/BllPalletBind.cs b/Wms/WMS.Entity/BllAsnEntity/BllPalletBind.cs
index 95ce3cc..6054c74 100644
--- a/Wms/WMS.Entity/BllAsnEntity/BllPalletBind.cs
+++ b/Wms/WMS.Entity/BllAsnEntity/BllPalletBind.cs
@@ -168,7 +168,12 @@
/// </summary>
public string IsBelt {get;set;}
-
+ /// <summary>
+ /// Desc:澶囨敞
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string Demo { get; set; }
}
}
diff --git a/Wms/WMS.Entity/DataEntity/DataStockDetail.cs b/Wms/WMS.Entity/DataEntity/DataStockDetail.cs
index 382bda8..ccd3218 100644
--- a/Wms/WMS.Entity/DataEntity/DataStockDetail.cs
+++ b/Wms/WMS.Entity/DataEntity/DataStockDetail.cs
@@ -235,7 +235,12 @@
/// </summary>
public string IsBelt {get;set;}
-
+ /// <summary>
+ /// Desc:澶囨敞
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string Demo { get; set; }
}
}
diff --git a/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs b/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs
index 4cfb390..8d2e7c8 100644
--- a/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs
+++ b/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs
@@ -17,6 +17,9 @@
// 鏍规嵁鍗曟嵁鍙疯幏鍙栧崟鎹槑缁嗗垪琛�
List<ArrivalNoticeDetailDto> GetArrivalNoticeDetails(ArrivalNoticeVm model);
+ //鏍规嵁鍏ュ簱鍗曞彿鑾峰彇鍏ュ簱鎬诲崟淇℃伅
+ List<BllArrivalNotice> GetArrivalNotice(ArrivalNoticeVm model);
+
// 鏍规嵁鍗曟嵁鏄庣粏ID鑾峰彇鏄庣粏璇︽儏
ArrivalNoticeDetailDto GetArrivalNoticeDetail(ArrivalNoticeDetailVm model);
diff --git a/Wms/Wms/Controllers/PdaAsnController.cs b/Wms/Wms/Controllers/PdaAsnController.cs
index bedbd3d..9fdbda8 100644
--- a/Wms/Wms/Controllers/PdaAsnController.cs
+++ b/Wms/Wms/Controllers/PdaAsnController.cs
@@ -46,6 +46,33 @@
}
/// <summary>
+ /// 鏍规嵁鍏ュ簱鍗曡幏鍙栧叆搴撴�诲崟淇℃伅
+ /// </summary>
+ /// <param name="model">ASNNo:鍏ュ簱鍗曞彿</param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult GetArrivalNotice(ArrivalNoticeVm model)
+ {
+ try
+ {
+ var models = _PdaAsnSvc.GetArrivalNotice(model);
+
+ if (models == null)
+ {
+ return Ok(new { code = 1, msg = "鍏ュ簱鍗曚俊鎭�", data = models });
+ }
+ else
+ {
+ return Ok(new { code = 0, msg = "鍏ュ簱鍗曚俊鎭�", data = models });
+ }
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+
+ /// <summary>
/// 鍒ゆ柇鎵樼洏鏄惁鍙敤
/// </summary>
/// <param name="model">PalletNo锛氭墭鐩樻潯鐮�</param>
--
Gitblit v1.8.0