From b9f7560cbe0e562a40e9515a0559a3e951f0fee6 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期一, 07 四月 2025 09:16:01 +0800
Subject: [PATCH] 问题修改
---
HTML/views/WareHouseSetting/StorageLegend.html | 1
Wms/Wms/Controllers/WeatherForecastController.cs | 9 +
Pda/View/SoSetting/productOut.html | 5 -
Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs | 2
Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs | 3
Wms/Model/ModelVm/SysVm/LocateVm.cs | 5 +
Wms/WMS.BLL/DataServer/StockServer.cs | 90 +++++++++++++++++
HTML/views/SOSetting/ExportNoticeEditFrom.html | 2
HTML/views/SOSetting/ExportNoticeAddFrom.html | 2
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 16 +++
HTML/views/BaseSetting/Materials.html | 2
HTML/views/StatisticalReport/InOutBoundReports.html | 1
HTML/views/index.html | 13 ++
Wms/Model/ModelDto/DataDto/StockDetailDto.cs | 5 +
Wms/Model/ModelDto/DataDto/TotalRecordDto.cs | 5 +
HTML/views/StatisticalReport/InventoryStatistics.html | 8 +
HTML/views/BaseSetting/MaterialsForm.html | 2
Wms/WMS.BLL/SysServer/StorageLocatServer.cs | 15 +++
HTML/views/SOSetting/ExportNotice.html | 60 ++++++++++-
Wms/WMS.Entity/BllSoEntity/BLLExportNotice.cs | 5 +
Wms/Wms/Controllers/DownApiController.cs | 4
21 files changed, 228 insertions(+), 27 deletions(-)
diff --git a/HTML/views/BaseSetting/Materials.html b/HTML/views/BaseSetting/Materials.html
index 5ac5cf5..bb78d5c 100644
--- a/HTML/views/BaseSetting/Materials.html
+++ b/HTML/views/BaseSetting/Materials.html
@@ -191,7 +191,7 @@
{{# if(d.Environment=='0'){ }}
<p>甯告俯</p>
{{# } else if(d.Environment=='1') { }}
- <p>浣庢俯</p>
+ <p>闃村噳</p>
{{# } else if(d.Environment=='3') { }}
<p>骞茬嚗閫氶</p>
{{# } }}
diff --git a/HTML/views/BaseSetting/MaterialsForm.html b/HTML/views/BaseSetting/MaterialsForm.html
index 53e89f6..2deae60 100644
--- a/HTML/views/BaseSetting/MaterialsForm.html
+++ b/HTML/views/BaseSetting/MaterialsForm.html
@@ -129,7 +129,7 @@
<select name="Environment" id="Environment" lay-verify="" lay-verify="" lay-search>
<option value=""></option>
<option value="0">甯告俯</option>
- <option value="1">浣庢俯</option>
+ <option value="1">闃村噳</option>
<!-- <option value="3">骞茬嚗閫氶</option> -->
</select>
</div>
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index 9b915e4..50f02ac 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -65,7 +65,7 @@
<option value="4">涓嶅悎鏍煎搧鍑哄簱</option>
<option value="5">涓棿鍝佸嚭搴�</option>
<option value="6">浠ｅ偍鍑哄簱</option>
- <option value="7">鍏朵粬鍑哄簱</option>
+ <option value="7">鍏跺畠鍑哄簱</option>
<option value="8">瀵勫瓨鍑哄簱</option>
<!-- 09 -->
<!-- <option value="0">鏍囧噯閿�鍞嚭搴�</option>
@@ -147,6 +147,18 @@
</select>
</div>
</div>
+
+ <div class="layui-inline DivCheck">
+ <label class="layui-form-label">鎷ｈ揣鏂瑰紡</label>
+ <div class="layui-input-inline " style="width: 220px;">
+ <select name="CheckVlues" id="CheckVlues" lay-filter="CheckVlues" lay-search>
+ <option value=""></option>
+ <option value="0" selected>鏆傚瓨鍖烘嫞璐�</option>
+ <option value="1">鍑哄簱鍙ｆ嫞璐�</option>
+ </select>
+ </div>
+ </div>
+
<div class="layui-inline DivLoadingArea" style="margin-top: 10px;">
<label class="layui-form-label">瑁呰溅鍙�</label>
<div class="layui-input-inline" style="width: 220px;">
@@ -230,7 +242,7 @@
case "6":
return "浠ｅ偍鍑哄簱";
case "7":
- return "鍏朵粬鍑哄簱";
+ return "鍏跺畠鍑哄簱";
case "8":
return "瀵勫瓨鍑哄簱";
default:
@@ -877,11 +889,14 @@
area: ['1200px', '90%'],
});
}else if(obj.event === 'outKu'){
+
$("#UnstackWay").val(0)
$("#UnstackWay").attr("disabled",false);
$("#LoadingArea").val('')
$("#PickingArea").val('')
- $('.DivLoadingArea').show()
+ $('.DivLoadingArea').show()
+ $('.DivPickingArea2').show()
+
form.render('select');
var param = {
soNo: SoNo
@@ -895,11 +910,13 @@
$('.DivPickingArea2').show()
}else{
isNeedUnpack='0'
- $('.DivPickingArea2').hide()
+ $('.DivPickingArea2').hide()
+ $('.DivCheck').hide()
}
if($('#UnstackWay').val()=='1'){
$('.DivPickingArea2').show()
- $('.LoadingArea').hide()
+ $('.DivCheck').hide()
+
}
@@ -913,10 +930,17 @@
});
}
});
+ $("#CheckVlues").val(0)
+ $("#CheckVlues").attr("disabled",false);
+ form.render('select');
}else{
$("#UnstackWay").val(1)
$("#UnstackWay").attr("disabled",true);
- form.render('select');
+ form.render('select');
+ $("#CheckVlues").val(0)
+ $("#CheckVlues").attr("disabled",true);
+ form.render('select');
+
$('.DivLoadingArea').hide()
@@ -1082,6 +1106,9 @@
btn: ['纭畾', '鍙栨秷'],
yes: function(index, layero) {
var pa = $('#PickingArea').val();
+ var check = $('#CheckVlues').val();
+ console.log("22222222222222"+check);
+
console.log(pa)
if (isChongFu== true) {
isChongFu= false;
@@ -1102,7 +1129,15 @@
isChongFu= true;
return;
}
- }
+ }else{if($("#PickingArea").val() == '')
+ {
+ layer.msg("璇烽�夋嫨鍑哄簱鍙�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ isChongFu= true;
+ return;
+ }}
if(isNeedUnpack == 1){
console.log($("#PickingArea").val())
if($('#UnstackWay').val()=='1'){
@@ -1119,6 +1154,7 @@
soNo: soNo,
unstackingMode:$('#UnstackWay').val(),
outMode: pa,
+ checkmode:check,
loadingAddre:$('#LoadingArea').val()
};
console.log(param);
@@ -1250,14 +1286,20 @@
var value = data.value;
if(value==0){
$('.DivLoadingArea').show()
+ $('.DivCheck').hide()
if(isNeedUnpack=='0'){
$('.DivPickingArea2').hide()
}else{
$('.DivPickingArea2').show()
}
- }else{
+ }else{
+ console.log("11111111111");
+
$('.DivLoadingArea').hide()
- $('.DivPickingArea2').show()
+ $('.DivPickingArea2').show()
+
+ $('.DivCheck').show()
+
}
});
diff --git a/HTML/views/SOSetting/ExportNoticeAddFrom.html b/HTML/views/SOSetting/ExportNoticeAddFrom.html
index 1a8cd3e..0c26517 100644
--- a/HTML/views/SOSetting/ExportNoticeAddFrom.html
+++ b/HTML/views/SOSetting/ExportNoticeAddFrom.html
@@ -41,7 +41,7 @@
<option value="4">涓嶅悎鏍煎搧鍑哄簱</option>
<option value="5">涓棿鍝佸嚭搴�</option>
<option value="6">浠ｅ偍鍑哄簱</option>
- <option value="7">鍏朵粬鍑哄簱</option>
+ <option value="7">鍏跺畠鍑哄簱</option>
<option value="8">瀵勫瓨鍑哄簱</option>
<!-- 09 -->
<!-- <option value="0">鏍囧噯閿�鍞嚭搴�</option>
diff --git a/HTML/views/SOSetting/ExportNoticeEditFrom.html b/HTML/views/SOSetting/ExportNoticeEditFrom.html
index 7b76a6c..8b4de4b 100644
--- a/HTML/views/SOSetting/ExportNoticeEditFrom.html
+++ b/HTML/views/SOSetting/ExportNoticeEditFrom.html
@@ -34,7 +34,7 @@
<option value="4">涓嶅悎鏍煎搧鍑哄簱</option>
<option value="5">涓棿鍝佸嚭搴�</option>
<option value="6">浠ｅ偍鍑哄簱</option>
- <option value="7">鍏朵粬鍑哄簱</option>
+ <option value="7">鍏跺畠鍑哄簱</option>
<option value="8">瀵勫瓨鍑哄簱</option>
<!-- 09 -->
<!-- <option value="0">鎴愬搧鍑哄簱</option>
diff --git a/HTML/views/StatisticalReport/InOutBoundReports.html b/HTML/views/StatisticalReport/InOutBoundReports.html
index 3ff44c4..f00c667 100644
--- a/HTML/views/StatisticalReport/InOutBoundReports.html
+++ b/HTML/views/StatisticalReport/InOutBoundReports.html
@@ -276,6 +276,7 @@
{field: 'CQty', title: '鍑哄簱鏁伴噺', align: 'center'},
{field: 'CAllotQty', title: '鍒嗛厤鏁伴噺', align: 'center'},
{field: 'CFactQty', title: '涓嬫灦鏁伴噺', align: 'center'},
+ {field: 'Qty', title: '缁撳瓨鏁伴噺', align: 'center'},
{field: 'CompleteQty', title: '鎷ｈ揣鏁伴噺', align: 'center'}
]];
var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
diff --git a/HTML/views/StatisticalReport/InventoryStatistics.html b/HTML/views/StatisticalReport/InventoryStatistics.html
index 3ab6c79..b7ce93e 100644
--- a/HTML/views/StatisticalReport/InventoryStatistics.html
+++ b/HTML/views/StatisticalReport/InventoryStatistics.html
@@ -342,7 +342,10 @@
{ field: 'OwnerName', title: '璐т富鍚嶇О', align: 'center' },
{ field: 'Qty', title: '搴撳瓨鏁伴噺', align: 'center', totalRow: true },
{ field: 'LockQty', title: '閿佸畾鏁伴噺', align: 'center', totalRow: true },
- { field: 'FrozenQty', title: '鍐荤粨鏁伴噺', align: 'center', totalRow: true }
+ { field: 'FrozenQty', title: '鍐荤粨鏁伴噺', align: 'center', totalRow: true },
+ { field: 'InspectStatus', templet: '#buttonTp2', title: '璐ㄦ鐘舵��', width: 90, align: 'center' },
+ { field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', width: 130, align: 'center' },
+ { field: 'ExpirationTime', title: '鏈夋晥鏈熻嚦', width: 130, align: 'center' },
]];
var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
@@ -417,6 +420,7 @@
var DetailColsArr = [[
{ field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 110, },
{ field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center', width: 100, },
+ { field: 'PLCLocatNo', title: '璁惧鍦板潃', align: 'center', width: 100, },
{ field: 'WareHouseName', title: '鎵�灞炰粨搴�', width: 90, align: 'center' },
{ field: 'RoadwayName', title: '鎵�灞炲贩閬�', width: 90, align: 'center' },
{ field: 'AreaName', title: '鎵�灞炲尯鍩�', width: 90, align: 'center' },
@@ -424,6 +428,8 @@
{ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center' },
{ field: 'Standard', title: '鐗╂枡瑙勬牸', width: 130, align: 'center' },
{ field: 'Type', title: '鐗╂枡绫诲瀷', width: 130, align: 'center', templet: '#SkuType' },
+ { field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', width: 130, align: 'center' },
+ { field: 'ExpirationTime', title: '鏈夋晥鏈熻嚦', width: 130, align: 'center' },
{ field: 'LotNo', title: '杩涘巶缂栧彿', align: 'center' },
{ field: 'OwnerNo', title: '璐т富缂栫爜', align: 'center' },
{ field: 'OwnerName', title: '璐т富鍚嶇О', align: 'center' },
diff --git a/HTML/views/WareHouseSetting/StorageLegend.html b/HTML/views/WareHouseSetting/StorageLegend.html
index 459e2a6..801da55 100644
--- a/HTML/views/WareHouseSetting/StorageLegend.html
+++ b/HTML/views/WareHouseSetting/StorageLegend.html
@@ -962,6 +962,7 @@
html += "<br/>鐗╂枡鍚嶇О锛�"+res.data.GoodsInfoList[i].SkuName;
html += "<br/>鎵规鍙凤細 "+res.data.GoodsInfoList[i].LotNo;
html += "<br/>鏁伴噺锛� "+res.data.GoodsInfoList[i].Qty;
+ html += "<br/>妫�楠岀姸鎬侊細"+res.data.GoodsInfoList[i].InspectStatus;
}
html += "</p>"
}
diff --git a/HTML/views/index.html b/HTML/views/index.html
index 835750b..d1b3e90 100644
--- a/HTML/views/index.html
+++ b/HTML/views/index.html
@@ -28,9 +28,17 @@
</a>
</li>
</ul>
+
<ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
-
+ <li class="layui-nav-item layui-hide layui-show-md-inline-block">
+ <!-- <a href="javascript:;">
+ <class="layui-nav-img"> -->
+ <a lay-href="set/user/info.html" id="username2">涓汉淇℃伅</a>
+ <i class="layui-icon layui-icon-down layui-nav-more"></i></a>
+
+ </li>
+
<li class="layui-nav-item layui-hide-xs" lay-unselect>
<a href="javascript:;" layadmin-event="theme">
<i class="layui-icon layui-icon-theme"></i>
@@ -139,6 +147,9 @@
$("#token").text($.cookie('token'));
}
+
+ $("#username2").html("褰撳墠鐢ㄦ埛锛�"+localStorage.getItem('keyUserName'));
+
var lastTime = new Date().getTime();
var currentTime = new Date().getTime();
var timeOut = 20*60*1000;
diff --git a/Pda/View/SoSetting/productOut.html b/Pda/View/SoSetting/productOut.html
index b18023e..bacb86a 100644
--- a/Pda/View/SoSetting/productOut.html
+++ b/Pda/View/SoSetting/productOut.html
@@ -262,11 +262,6 @@
<input type="checkbox" name="IsZhengTuo" id="IsZhengTuo" lay-skin="switch" lay-text="鏄瘄鍚�"
lay-filter="IsZhengTuo">
</div>
- <label class="layui-form-label" lang>鏄惁杩炵画鎷ｈ揣锛�</label>
- <div class="layui-input-block">
- <input type="checkbox" name="IsCheckCon" id="IsCheckCon" lay-skin="switch" lay-text="鏄瘄鍚�"
- lay-filter="IsCheckCon">
- </div>
</div>
<div id="BoxDIv" class="layout-tab-page">
<table class="layout-tab-content" border="" cellspacing="" cellpadding="">
diff --git a/Wms/Model/ModelDto/DataDto/StockDetailDto.cs b/Wms/Model/ModelDto/DataDto/StockDetailDto.cs
index d3fd87e..23f8268 100644
--- a/Wms/Model/ModelDto/DataDto/StockDetailDto.cs
+++ b/Wms/Model/ModelDto/DataDto/StockDetailDto.cs
@@ -96,6 +96,11 @@
public string LocatNo { get; set; }
/// <summary>
+ /// 璁惧鍦板潃
+ /// </summary>
+ public string PLCLocatNo { get; set; }
+
+ /// <summary>
/// 鎵樼洏鍙�
/// </summary>
public string PalletNo { get; set; }
diff --git a/Wms/Model/ModelDto/DataDto/TotalRecordDto.cs b/Wms/Model/ModelDto/DataDto/TotalRecordDto.cs
index 901afc0..222b0b6 100644
--- a/Wms/Model/ModelDto/DataDto/TotalRecordDto.cs
+++ b/Wms/Model/ModelDto/DataDto/TotalRecordDto.cs
@@ -52,6 +52,11 @@
public decimal RCompleteQty { get; set; }
/// <summary>
+ /// 搴撳瓨鏁伴噺
+ /// </summary>
+ public decimal Qty { get; set; }
+
+ /// <summary>
/// 鍑哄簱鏁伴噺
/// </summary>
public decimal CQty { get; set; }
diff --git a/Wms/Model/ModelVm/SysVm/LocateVm.cs b/Wms/Model/ModelVm/SysVm/LocateVm.cs
index 1c805df..2f13f8d 100644
--- a/Wms/Model/ModelVm/SysVm/LocateVm.cs
+++ b/Wms/Model/ModelVm/SysVm/LocateVm.cs
@@ -195,5 +195,10 @@
/// 鏁伴噺
/// </summary>
public decimal? Qty { get; set; }
+
+ /// <summary>
+ /// 璐ㄩ噺鐘舵��
+ /// </summary>
+ public string InspectStatus { get; set; }
}
}
diff --git a/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs b/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs
index 855d1dd..2f354dd 100644
--- a/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs
+++ b/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs
@@ -230,7 +230,7 @@
}
if (date.Id == model.CreateUser)
{
- throw new Exception("澶嶆牳澶辫触锛屽鏍镐汉鍛樺拰鍏抽棴璁㈠崟浜哄憳涓嶈兘鐩稿悓锛�");
+ throw new Exception("澶嶆牳澶辫触锛屽鏍镐汉鍛樺拰鍒涘缓璐ㄦ鍗曟嵁浜哄憳涓嶈兘鐩稿悓锛�");
}
int isTui = 0;
//楠岃瘉鍏ュ簱鍗曞彿鏄惁涓虹┖
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 37c8187..3cc81a2 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -1690,7 +1690,7 @@
#region 涓嬪彂鍑哄簱銆佸嚭搴撳畬鎴愩�侀噸鏂颁笅鍙戜换鍔°�佸彇娑堜换鍔°�佸紓甯稿鐞�
// 涓嬪彂鍑哄簱锛堣皟鐢╟s鎺ュ彛缁欎粬搴撲綅鍦板潃锛�
- public List<OutCommandDto> IssueOutHouse(string soNo, string unstackingMode, string outMode, string loadingAddre, int userId, string url, out string str)
+ public List<OutCommandDto> IssueOutHouse(string soNo, string unstackingMode, string outMode,string checkmode, string loadingAddre, int userId, string url, out string str)
{
try
{
@@ -1710,6 +1710,9 @@
{
throw new Exception($"鏈壘鍒皗soNo}鍑哄簱鍗曚俊鎭�");
}
+ //鏇存柊鍑哄簱鍗曟嫞閫夋柟寮�
+ notice.UDF1 = checkmode;
+ Db.Updateable(notice).ExecuteCommand();
//鎵�鏈夎鍑哄簱鐨勫嚭搴撳垎閰嶄俊鎭�(鏈笅鍙戠殑淇℃伅鍜屽緟鎷ｈ揣鐨勪俊鎭拰閮ㄥ垎鎷ｈ揣鍚庡洖娴佸叆搴撶殑鎵樼洏)
var list = Db.Queryable<BllExportAllot>().Where(a => a.IsDel == "0" && a.SONo == soNo && (a.Status == "0" || a.Status == "3")).ToList();
if (list.Count == 0) //鍒ゆ柇鏄惁鏈夐渶瑕佷笅鍙戠殑鍑哄簱娴佹按
@@ -2446,6 +2449,17 @@
positionEnd = Db.Queryable<SysStorageLocat>().OrderBy(m => m.LocatNo).First(m => (m.AreaNo == "B01"|| m.AreaNo == "B02"||m.AreaNo == "B04") && m.Status == "0" && m.Flag == "0").LocatNo;
}
+ else if (type1.Type == "0")//鎴愬搧鍑哄簱
+ {
+ if (type1.UDF1 == "0") //鍑哄簱鍒版殏瀛樺尯
+ {
+ positionEnd = Db.Queryable<SysStorageLocat>().OrderBy(m => m.LocatNo).First(m => m.AreaNo == "B02" && m.Status == "0" && m.Flag == "0").LocatNo;
+ }
+ else
+ {
+ return;
+ }
+ }
else //鍏朵粬鍗曟嵁绫诲瀷閮藉瓨鏀惧彂璐х紦瀛樺尯
{
positionEnd = Db.Queryable<SysStorageLocat>().OrderBy(m => m.LocatNo).First(m => m.AreaNo == "B02" && m.Status == "0" && m.Flag == "0").LocatNo;
diff --git a/Wms/WMS.BLL/DataServer/StockServer.cs b/Wms/WMS.BLL/DataServer/StockServer.cs
index 958fa07..9c802dc 100644
--- a/Wms/WMS.BLL/DataServer/StockServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockServer.cs
@@ -90,9 +90,27 @@
//搴撳瓨鎬婚噺
List<MateDataStockDto> StockListDto = new List<MateDataStockDto>();
+ DataStockDetail detail = new DataStockDetail();
foreach (var item in StockList)
{
+
+ detail = Db.Queryable<DataStockDetail>().First(w => w.SkuNo == item.SkuNo && w.LotNo == item.LotNo && w.IsDel == "0");
+ if (detail != null)
+ {
+ if (!string.IsNullOrEmpty(detail.ProductionTime.ToString()))
+ {
+ item.ProductionTime = (DateTime)detail.ProductionTime;
+ }
+ if (!string.IsNullOrEmpty(detail.ExpirationTime.ToString()))
+ {
+ item.ExpirationTime = (DateTime)detail.ExpirationTime;
+ }
+ item.InspectStatus = detail.InspectStatus;
+ }
+
+
+
StockListDto.Add(item);
////鍒ゆ柇搴撳瓨鎬婚噺鏄惁鎷ユ湁鐗╂枡
//if (StockListDto.Count > 0)
@@ -238,10 +256,70 @@
categoryNo = categoryNo, //閫昏緫搴撳尯
type = type
});
+ foreach (var item in stockDetailsList)
+ {
+ if (!string.IsNullOrEmpty(item.LocatNo))
+ {
+ if (item.WareHouseNo == "W01")
+ {
+ item.PLCLocatNo = GetDjAdress(item.LocatNo.Substring(1, 2), item.LocatNo.Substring(0, 2), item.LocatNo.Substring(6, 2)).ToString() + item.LocatNo.Substring(2, 2) + item.LocatNo.Substring(4, 2);
+ }
+ }
+
+ }
return stockDetailsList;
}
#endregion
+
+ /// <summary>
+ /// 鏍规嵁鍌ㄤ綅鎺掕幏鍙栬泛鏈哄搴旂殑鍦板潃鎺�03010302
+ /// </summary>
+ /// <param name="road">鎺�02</param>
+ /// <param name="pai">鎺�03</param>
+ /// <param name="dept">娣卞害02</param>
+ /// <returns></returns>
+ public static int GetDjAdress(string road, string pai, string dept)
+ {
+ var roadNum = int.Parse(road);
+ var paiNum = int.Parse(pai);
+ var deptNum = int.Parse(dept);
+
+ var paiVal = 0;
+
+ // 鍒ゆ柇鎺掑鍋舵暟
+ if (paiNum % 2 == 0)
+ {
+ if (deptNum == 1)
+ {
+ paiVal = 3;
+ }
+ else
+ {
+ paiVal = 4;
+ }
+ }
+ else
+ {
+ if (deptNum == 1)
+ {
+ paiVal = 2;
+
+ }
+ else
+ {
+ paiVal = 1;
+
+ }
+ }
+
+ if (paiVal == 0)
+ {
+ throw new Exception("鎺掕浆鎹㈠け璐�");
+ }
+ return paiVal;
+
+ }
#region 浣庡簱瀛橀璀�
@@ -365,9 +443,12 @@
//startTime = startTime,
//endTime = endTime
});
+ DataStock stock = new DataStock();
+ stock = Db.Queryable<DataStock>().First();
//鍚堝苟鏁版嵁
int a = 0;
+ decimal qty = 0;
foreach (var h in totalHListData)
{
if (a >= totalCListData.Count)
@@ -376,16 +457,23 @@
}
foreach (var c in totalCListData)
{
+
//鍒ゆ柇鍑哄簱鏄惁鎷ユ湁鐩稿悓鎵规 涓旂墿鏂欑浉鍚�
if (h.LotNo == c.LotNo)
{
if (h.SkuNo == c.SkuNo && h.SkuName == c.SkuName)
{
+ stock = Db.Queryable<DataStock>().First(w=>w.SkuNo == h.SkuNo && w.SkuName == h.SkuName && w.LotNo == h.LotNo && w.IsDel == "0");
+ if (stock != null)
+ {
+ qty = stock.Qty;
+ }
h.CQty = c.CQty; //鍑哄簱鏁伴噺
h.CAllotQty = c.CAllotQty; //鍒嗛厤鏁伴噺
h.CFactQty = c.CFactQty; //涓嬫灦鏁伴噺
h.CompleteQty = c.CompleteQty; //鎷ｈ揣鏁伴噺
- //h.SONo = c.SONo; //鍑哄簱鍗曞彿
+ h.Qty = qty; //褰撳墠搴撳瓨
+
a += 1;
diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index 83c4ef3..5ad72d4 100644
--- a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
@@ -796,6 +796,7 @@
try
{
LocateInfoVm model = new LocateInfoVm();
+ string status = "";
//鍌ㄤ綅淇℃伅
SysStorageLocat storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.LocatNo == locatNo && w.IsDel == "0");
if (storageLocat == null)
@@ -823,6 +824,19 @@
goodsModel.SkuName = item.SkuName;
goodsModel.LotNo = item.LotNo;
goodsModel.Qty = item.Qty;
+ switch (item.InspectStatus)
+ {
+ case "0":
+ status = "寰呮楠�";
+ break;
+ case "1":
+ status = "鍚堟牸";
+ break;
+ case "2":
+ status = "涓嶅悎鏍�";
+ break;
+ }
+ goodsModel.InspectStatus = status;
goodsList.Add(goodsModel);
}
@@ -856,6 +870,7 @@
goodsModel.SkuName = noticeDetail.SkuName;
goodsModel.LotNo = noticeDetail.LotNo;
goodsModel.Qty = noticeDetail.Qty;
+ goodsModel.InspectStatus = "寰呮楠�";
goodsList.Add(goodsModel);
}
diff --git a/Wms/WMS.Entity/BllSoEntity/BLLExportNotice.cs b/Wms/WMS.Entity/BllSoEntity/BLLExportNotice.cs
index b8549d4..6a89f15 100644
--- a/Wms/WMS.Entity/BllSoEntity/BLLExportNotice.cs
+++ b/Wms/WMS.Entity/BllSoEntity/BLLExportNotice.cs
@@ -137,5 +137,10 @@
/// 澶嶆牳鏃堕棿
/// </summary>
public DateTime? CheckTime { get; set; }
+
+ /// <summary>
+ /// 鍑哄簱鎷ｉ�夋柟寮� 0锛欰GV鎷夎嚦鏆傚瓨鍖烘嫞閫夛紝1锛氬嚭搴撳彛鎷ｉ��
+ /// </summary>
+ public string UDF1 { get; set; }
}
}
diff --git a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
index 59d9535..0424ec9 100644
--- a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
+++ b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
@@ -122,11 +122,12 @@
/// </summary>
/// <param name="soNo">鍑哄簱鍗曞彿</param>
/// <param name="outMode">鍑哄簱鍙�</param>
+ /// <param name="checkmode">鍒嗘嫞绫诲瀷</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <param name="url">涓嬪彂鍑哄簱璺緞</param>
/// <param name="str">鎻愮ず淇℃伅</param>
/// <returns>涓嬪彂鐨勬寚浠ら泦鍚�</returns>
- List<OutCommandDto> IssueOutHouse(string soNo, string unstackingMode, string outMode, string loadingAddre, int userId,string url,out string str);
+ List<OutCommandDto> IssueOutHouse(string soNo, string unstackingMode, string outMode,string checkmode, string loadingAddre, int userId,string url,out string str);
/// <summary>
/// wcs杩斿洖鐨勬垚鍔熶俊鍙锋垨鎵嬪姩瀹屾垚锛堝嚭搴撴垚鍔燂級
/// </summary>
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index 753060d..68ed079 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -64,7 +64,7 @@
/// <returns></returns>
[Authorize]
[HttpGet]
- public IActionResult IssueOutHouse(string soNo, string unstackingMode, string outMode, string loadingAddre)
+ public IActionResult IssueOutHouse(string soNo, string unstackingMode, string outMode,string checkmode, string loadingAddre)
{
try
{
@@ -85,7 +85,7 @@
// return Ok(new { code = 1, msg = "璇烽�夋嫨鍑哄簱鍙�" });
//}
- var list = _exNoticeSvc.IssueOutHouse(soNo, unstackingMode, outMode, loadingAddre, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str);
+ var list = _exNoticeSvc.IssueOutHouse(soNo, unstackingMode, outMode, checkmode, loadingAddre, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str);
return Ok(new { code = 0, msg = str, data = list });
diff --git a/Wms/Wms/Controllers/WeatherForecastController.cs b/Wms/Wms/Controllers/WeatherForecastController.cs
index 549f15e..f8e8b90 100644
--- a/Wms/Wms/Controllers/WeatherForecastController.cs
+++ b/Wms/Wms/Controllers/WeatherForecastController.cs
@@ -12,6 +12,7 @@
using WMS.Entity.Context;
using WMS.IBLL.ISysServer;
using Wms.Tools;
+using WMS.IBLL.ILogServer;
namespace Wms.Controllers
@@ -29,12 +30,15 @@
private readonly ILogger<WeatherForecastController> _logger;
private readonly IUserInforServer _userMan;
private readonly DataContext Db = new DataContext();
+ private readonly IOperationSysServer _operation; //鎿嶄綔鏃ュ織
- public WeatherForecastController(ITokenHelper _tokenHelper, ILogger<WeatherForecastController> logger, IUserInforServer userMan)
+ public WeatherForecastController(ITokenHelper _tokenHelper, ILogger<WeatherForecastController> logger, IUserInforServer userMan ,IOperationSysServer operation)
{
tokenHelper = _tokenHelper;
_logger = logger;
_userMan = userMan;
+
+ _operation = operation; //鎿嶄綔鏃ュ織
}
[AllowAnonymous]
@@ -84,6 +88,9 @@
{"LoginName", model.LoginName}
};
var tnToken = tokenHelper.CreateToken(keyValuePairs);
+
+ _operation.InsertOperation("鎿嶄綔鏃ュ織", "鎿嶄綔鏃ュ織", "", "鐧婚檰", "鐢ㄦ埛鐧婚檰锛�"+ model.LoginName, Convert.ToInt32(userId));
+
return Ok(new { code = 200, ToKen = tnToken });
}
else //褰撳墠璐﹀彿琚鐢�
--
Gitblit v1.8.0