From 9885a8a2f98104f5ee63dd5ab8023095a1d8b9f6 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期一, 02 九月 2024 08:23:44 +0800
Subject: [PATCH] 功能测试
---
Wms/WMS.Entity/BllAsnEntity/BllBoxInfo.cs | 4
Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs | 4
HTML/views/QualityControl/QualityChangeLog.html | 2
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 5
HTML/views/ASNSetting/PalletBind.html | 8
HTML/views/ASNSetting/BindBoxInfo.html | 312 +++++++++++++++++++-------------------
Wms/Wms/Controllers/BllAsnController.cs | 3
HTML/views/QualityControl/InspectionRequest.html | 24 +-
Wms/Model/InterFaceModel/AsnModels.cs | 5
Wms/WMS.BLL/BllQualityServer/InspectionRequestServer.cs | 80 ++++++----
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 14 +
11 files changed, 245 insertions(+), 216 deletions(-)
diff --git a/HTML/views/ASNSetting/BindBoxInfo.html b/HTML/views/ASNSetting/BindBoxInfo.html
index 927d6a3..6fe1a78 100644
--- a/HTML/views/ASNSetting/BindBoxInfo.html
+++ b/HTML/views/ASNSetting/BindBoxInfo.html
@@ -1,40 +1,45 @@
<!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">
- </head>
- <body>
- <div class="layui-fluid" style="padding-bottom: 0;">
- <div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto">
- <div class="layui-form-item" style="margin-bottom: 0px;">
-
- <div class="layui-inline zongdan" >
- <label class="layui-form-label" style="width: 60px;">鏀爜</label>
- <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
- <input type="text" id="BoxNo3" name="BoxNo3" placeholder="鏀爜" autocomplete="off" class="layui-input">
- </div>
- </div>
+<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">
+</head>
- <div class="layui-inline sousuo">
- <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit lay-filter="LAY-app-contlist-search">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
- </button>
+<body>
+ <div class="layui-fluid" style="padding-bottom: 0;">
+
+ <div class="layui-card">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto">
+ <div class="layui-form-item" style="margin-bottom: 0px;">
+
+ <div class="layui-inline zongdan">
+ <label class="layui-form-label" style="width: 60px;">鏀爜</label>
+ <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
+ <input type="text" id="BoxNo3" name="BoxNo3" placeholder="鏀爜" autocomplete="off"
+ class="layui-input">
</div>
</div>
- </div>
+
+ <div class="layui-inline sousuo">
+ <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
+ lay-filter="LAY-app-contlist-search">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
+ </button>
+ </div>
+ </div>
</div>
+ </div>
- <div class="layui-card-body">
+ <div class="layui-card-body">
- <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
- <script type="text/html" id="BoxStatus">
+ <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
+ <script type="text/html" id="BoxStatus">
{{# function GetBoxInfoBtn(d){
var html = '';
if(d.Status=='0'){
@@ -51,133 +56,132 @@
}}
{{ GetBoxInfoBtn(d) }}
</script>
-
- </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>
- layui.config({
- base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'table', 'laypage', 'layer'], function() {
- var table = layui.table,
- form = layui.form,
- laypage = layui.laypage,
- layer = layui.layer;
- var $ = layui.$,
- form = layui.form,
- layer = layui.layer;
- var boxNo = getQueryString('BoxNo');
- var bindNo = getQueryString('BindNo');
- if (!boxNo)
- {
- boxNo = "";
- }
- else
- {
- var param = {
- boxNo: boxNo,
- };
-
- console.log(getQueryString('BoxNo'))
- console.log(boxNo)
- refreshTable();
- function refreshTable() {
- var param={
- BoxNo:getQueryString('BoxNo'),
- BoxNo3:$("#BoxNo3").val(),
- BindNo:getQueryString('BindNo')
- }
- sendData(IP + "/BllAsn/GetBoxInfoByBoxNo", param , 'get', function(res) {
- console.log(res)
- if (res.code == 0) { //鎴愬姛
- var list = res.data;
- $.extend(infoOptions, {
- data: list
- });
- infoOptions.page = {
- curr: 1
- }
- tableIns = table.render(infoOptions);
- }
- else { //涓嶆垚鍔�
- layer.msg('鑾峰彇绠辩爜鏄庣粏鍒楄〃淇℃伅澶辫触锛�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
- }
- });
- }
- }
- // 琛ㄥ崟闇�瑕佺殑鍙橀噺
- var infoOptions = {
- elem: '#LAY-app-content-list',
- height: 'full-98',
- id: 'LAY-app-content-list',
- page: true,
- limit: pageCnt,
- limits: pageLimits,
- even: true,
- cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- cols:
- [[
- {
- title: '搴忓彿', type: 'numbers', fixed: 'left'
- },
- {
- field: 'SkuNo', title: '鐗╂枡鍙�', align: 'center',hide:true
- },
- {
- field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center',hide:true
- },
- {
- field: 'PalletNo', title: '鎵樼洏鏉＄爜', align: 'center', width: 110,
- },
- {
- field: 'BoxNo', title: '绠辩爜', align: 'center', width: 100,hide:true
- },
- {
- field: 'BoxNo2', title: '鐩掔爜', align: 'center', width: 100,hide:true
- },
- {
- field: 'BoxNo3', title: '鏀爜', align: 'center', width: 220,
- },
- {
- field: 'Status', title: '绠辨敮鐘舵��', align: 'center',width: 110, templet: '#BoxStatus',
- },
- {
- field: 'LotNo', title: '鎵规', align: 'center',width: 160,
- },
- {
- field: 'LotText', title: '鎵规鎻忚堪', align: 'center',
- },
- {
- field: 'Qty', title: '鏁伴噺', width: 90, align: 'center',
- },
- {
- field: 'FullQty', title: '鏁寸鏁伴噺', width: 100, align: 'center',
- },
- ]]
+ </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>
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'table', 'laypage', 'layer'], function () {
+ var table = layui.table,
+ form = layui.form,
+ laypage = layui.laypage,
+ layer = layui.layer;
+ var $ = layui.$,
+ form = layui.form,
+ layer = layui.layer;
+ var boxNo = getQueryString('BoxNo');
+ var bindNo = getQueryString('BindNo');
+ if (!boxNo) {
+ boxNo = "";
+ }
+ else {
+ var param = {
+ boxNo: boxNo,
};
-
- //鐩戝惉鎼滅储
- form.on('submit(LAY-app-contlist-search)', function(data) {
- refreshTable();
- });
-
- //鑾峰彇娴忚鍣ㄥ弬鏁�
- 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;
+ console.log(getQueryString('BoxNo'))
+ console.log(boxNo)
+ refreshTable();
+ function refreshTable() {
+ var param = {
+ BoxNo: getQueryString('BoxNo'),
+ BoxNo3: $("#BoxNo3").val(),
+ BindNo: getQueryString('BindNo')
+ }
+ sendData(IP + "/BllAsn/GetBoxInfoByBoxNo", param, 'get', function (res) {
+ console.log(res)
+ if (res.code == 0) { //鎴愬姛
+ var list = res.data;
+ $.extend(infoOptions, {
+ data: list
+ });
+ infoOptions.page = {
+ curr: 1
+ }
+ tableIns = table.render(infoOptions);
+ }
+ else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇绠辩爜鏄庣粏鍒楄〃淇℃伅澶辫触锛�', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
}
- })
- </script>
- </body>
-</html>
+ }
+ // 琛ㄥ崟闇�瑕佺殑鍙橀噺
+ var infoOptions = {
+ elem: '#LAY-app-content-list',
+ height: 'full-98',
+ id: 'LAY-app-content-list',
+ page: true,
+ limit: pageCnt,
+ limits: pageLimits,
+ even: true,
+ cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ cols:
+ [[
+ {
+ title: '搴忓彿', type: 'numbers', fixed: 'left'
+ },
+ {
+ field: 'SkuNo', title: '鐗╂枡鍙�', align: 'center', hide: true
+ },
+ {
+ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', hide: true
+ },
+ {
+ field: 'PalletNo', title: '鎵樼洏鏉＄爜', align: 'center',
+ },
+ {
+ field: 'BoxNo', title: '绠辩爜', align: 'center', hide: false
+ },
+ {
+ field: 'BoxNo2', title: '鐩掔爜', align: 'center', width: 100, hide: true
+ },
+ {
+ field: 'BoxNo3', title: '鏀爜', align: 'center',
+ },
+ {
+ field: 'Status', title: '绠辨敮鐘舵��', align: 'center', width: 110, templet: '#BoxStatus',
+ },
+ {
+ field: 'LotNo', title: '鎵规', align: 'center', width: 160,
+ },
+ {
+ field: 'LotText', title: '鎵规鎻忚堪', align: 'center', hide: true
+ },
+ {
+ field: 'Qty', title: '鏁伴噺', width: 90, align: 'center',
+ },
+ {
+ field: 'FullQty', title: '鏁寸鏁伴噺', width: 100, align: 'center',
+ },
+ ]]
+ };
+
+
+ //鐩戝惉鎼滅储
+ form.on('submit(LAY-app-contlist-search)', function (data) {
+ refreshTable();
+ });
+
+ //鑾峰彇娴忚鍣ㄥ弬鏁�
+ 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/PalletBind.html b/HTML/views/ASNSetting/PalletBind.html
index 87964db..83dcf1e 100644
--- a/HTML/views/ASNSetting/PalletBind.html
+++ b/HTML/views/ASNSetting/PalletBind.html
@@ -534,11 +534,11 @@
var DetailColsArr = [[
{ field: '', title: '搴忓彿', type: 'numbers', width: 60, align: 'center', fixed: 'left', "disabled": true },
{ field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 95 },
- { field: 'PalletNo2', title: '鎵樼洏缂栧彿LV2', align: 'center', width: 120 },
- { field: 'PalletNo3', title: '鎵樼洏缂栧彿LV3', align: 'center', width: 120 },
+ // { field: 'PalletNo2', title: '鎵樼洏缂栧彿LV2', align: 'center', width: 120 },
+ // { field: 'PalletNo3', title: '鎵樼洏缂栧彿LV3', align: 'center', width: 120 },
{ field: 'BoxNo', title: '绠卞彿', align: 'center', width: 220 },
- { field: 'BoxNo2', title: '鐩掑彿', align: 'center', width: 220 },
- { field: 'BoxNo3', title: '鏀彿', align: 'center', width: 220 },
+ // { field: 'BoxNo2', title: '鐩掑彿', align: 'center', width: 220 },
+ // { field: 'BoxNo3', title: '鏀彿', align: 'center', width: 220 },
{ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width: 150 },
{ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', align: 'center', width: 226 },
{ field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 150, },
diff --git a/HTML/views/QualityControl/InspectionRequest.html b/HTML/views/QualityControl/InspectionRequest.html
index 315ac19..3119fd9 100644
--- a/HTML/views/QualityControl/InspectionRequest.html
+++ b/HTML/views/QualityControl/InspectionRequest.html
@@ -379,18 +379,18 @@
{ field: 'Status', title: '鎵ц鐘舵��', align: 'center', width: 90, templet: '#templetStatus' },
{ field: 'RequestTime', title: '璇烽獙鏃ユ湡', align: 'center', width: 165, templet: '#templetCompleteTime' },
{ field: 'RequestUser', title: '璇烽獙浜�', align: 'center', width: 165 },
- { field: 'UDF1', title: '鑷畾涔�1', align: 'center', width: 100 },
- { field: 'UDF2', title: '鑷畾涔�2', align: 'center', width: 100 },
- { field: 'UDF3', title: '鑷畾涔�3', align: 'center', width: 100 },
- { field: 'UDF4', title: '鑷畾涔�4', align: 'center', width: 100 },
- { field: 'UDF5', title: '鑷畾涔�5', align: 'center', width: 100 },
+ // { field: 'UDF1', title: '鑷畾涔�1', align: 'center', width: 100 },
+ // { field: 'UDF2', title: '鑷畾涔�2', align: 'center', width: 100 },
+ // { field: 'UDF3', title: '鑷畾涔�3', align: 'center', width: 100 },
+ // { field: 'UDF4', title: '鑷畾涔�4', align: 'center', width: 100 },
+ // { field: 'UDF5', title: '鑷畾涔�5', align: 'center', width: 100 },
{ field: 'CreateTime', title: '鍒涘缓鏃堕棿', align: 'center', width: 165, templet: '#templetCreateTime' },
{ field: 'CreateUserName', title: '鍒涘缓浜�', align: 'center', width: 165 },
{ field: 'UpdateTime', title: '瀹屾垚鏃ユ湡', align: 'center', width: 165, templet: '#templetUpdateTime' },
{ field: 'UpdateUserName', title: '鍏冲崟浜�', align: 'center', width: 165 },
- { field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 80, align: 'center', toolbar: '#InspectionRequestList', "disabled": true }
+ { field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 180, align: 'center', toolbar: '#InspectionRequestList', "disabled": true }
]];
var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
@@ -542,7 +542,7 @@
break;
case "edit":
$("#PickingArea").val('')
- form.render('select');
+ form.render('select');
layer.open({
type: 1,
title: '纭鍑哄簱鍙�',
@@ -675,11 +675,11 @@
{ field: 'BoxNo2', title: '鐩掑彿', align: 'center', width: 220 },
{ field: 'BoxNo3', title: '鏀彿', align: 'center', width: 220 },
{ field: 'CompleteQty', title: '鍙栨牱鏁伴噺', align: 'center', width: 105, },
- { field: 'UDF1', title: '鑷畾涔�1', align: 'center', width: 100 },
- { field: 'UDF2', title: '鑷畾涔�2', align: 'center', width: 100 },
- { field: 'UDF3', title: '鑷畾涔�3', align: 'center', width: 100 },
- { field: 'UDF4', title: '鑷畾涔�4', align: 'center', width: 100 },
- { field: 'UDF5', title: '鑷畾涔�5', align: 'center', width: 100 },
+ // { field: 'UDF1', title: '鑷畾涔�1', align: 'center', width: 100 },
+ // { field: 'UDF2', title: '鑷畾涔�2', align: 'center', width: 100 },
+ // { field: 'UDF3', title: '鑷畾涔�3', align: 'center', width: 100 },
+ // { field: 'UDF4', title: '鑷畾涔�4', align: 'center', width: 100 },
+ // { field: 'UDF5', title: '鑷畾涔�5', align: 'center', width: 100 },
{ field: 'CreateTime', title: '鍙栨牱鏃ユ湡', align: 'center', width: 165, templet: '#templetCreateTime' },
{ field: 'CreateUserName', title: '鍙栨牱浜�', align: 'center', width: 165 },
diff --git a/HTML/views/QualityControl/QualityChangeLog.html b/HTML/views/QualityControl/QualityChangeLog.html
index a21afd4..c82d342 100644
--- a/HTML/views/QualityControl/QualityChangeLog.html
+++ b/HTML/views/QualityControl/QualityChangeLog.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
- <title>璐ㄦ淇℃伅褰曞叆</title>
+ <title>璐ㄦ鍙樻洿璁板綍</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport"
diff --git a/Wms/Model/InterFaceModel/AsnModels.cs b/Wms/Model/InterFaceModel/AsnModels.cs
index d74e239..a029066 100644
--- a/Wms/Model/InterFaceModel/AsnModels.cs
+++ b/Wms/Model/InterFaceModel/AsnModels.cs
@@ -29,6 +29,11 @@
public string Origin { get; set; }
/// <summary>
+ /// 鍒跺崟浜�
+ /// </summary>
+ public string Username { get; set; }
+
+ /// <summary>
/// 鍗曟嵁鏄庣粏
/// </summary>
public List<AsnDetail> AsnDetails { get; set; }
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 51dab54..a5376b2 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -94,8 +94,8 @@
.LeftJoin<SysUserInfor>((tb1, tb2,tb3) => tb1.CreateUser == tb3.Id)
.LeftJoin<SysUserInfor>((tb1,tb2,tb3,tb4) => tb1.UpdateUser == tb4.Id)
.LeftJoin<SysMaterials>((tb1, tb2, tb3, tb4,tb5) => tb1.SkuNo == tb5.SkuNo && tb5.IsDel == "0")
- .LeftJoin<SysUnit>((tb1, tb2, tb3, tb4, tb5,tb6) => tb5.UnitNo == tb6.UnitNo)
- .LeftJoin<SysPackag>((tb1, tb2, tb3, tb4, tb5, tb6,tb7) => tb1.PackagNo == tb7.PackagNo)
+ .LeftJoin<SysUnit>((tb1, tb2, tb3, tb4, tb5,tb6) => tb5.UnitNo == tb6.UnitNo && tb6.IsDel == "0")
+ .LeftJoin<SysPackag>((tb1, tb2, tb3, tb4, tb5, tb6,tb7) => tb1.PackagNo == tb7.PackagNo && tb7.IsDel == "0")
.Select((tb1, tb2, tb3, tb4, tb5,tb6, tb7) => new ArrivalNoticeDetailDto()
{
Id = tb1.Id,
@@ -1214,6 +1214,7 @@
CustomerNo = model.Customer,
CustomerName = CustomerModel.CustomerName,
OrderCode = model.OrderCode,
+ UserName = model.Username
};
// 鍏ュ簱鏄庣粏琛ㄤ俊鎭�
diff --git a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
index 6d276f2..f6d72cd 100644
--- a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
@@ -505,8 +505,8 @@
InspectStatus = a.InspectStatus,
Origin = a.Origin,
- QtyCount = a.QtyCount,
- QtyOrd = a.QtyOrd,
+ QtyCount = (int)a.QtyCount,
+ QtyOrd = (int)a.QtyOrd,
CreateUserName = b.RealName,
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index 33efe0f..30adf61 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -33,7 +33,7 @@
#region 鎺ュ彛鏂规硶
- //JC23缁戝畾鐗╂枡鎵樼洏鍗冲鍔犲簱瀛�
+ //JC26缁戝畾鐗╂枡鎵樼洏鍗冲鍔犲簱瀛�
public void BindPalletStock(BoxPalletBindVm model, int userId)
{
try
@@ -267,7 +267,7 @@
InspectQty = 0,
ASNNo = bind.ASNNo,
ASNDetailNo = bind.ASNDetailNo,
- WareHouseNo = "",//鎵�灞炰粨搴�
+ WareHouseNo = "W01",//鎵�灞炰粨搴�
RoadwayNo = "",//鎵�灞炲贩閬�
AreaNo = "",//鎵�灞炲尯鍩�
LocatNo = "",//鍌ㄤ綅鍦板潃
@@ -446,8 +446,8 @@
Standard = box.Standard,
PackageStandard = box.PackageStandard,
StoreTime = box.StoreTime,
- QtyCount = (int)box.QtyCount,
- QtyOrd = (int)box.QtyOrd,
+ QtyCount = box.QtyCount,
+ QtyOrd = box.QtyOrd,
CreateUser = userId,
CreateTime = comTime,
};
@@ -637,7 +637,7 @@
.LeftJoin<SysUserInfor>((a, b, c) => a.CreateUser == c.Id)
.LeftJoin<SysUserInfor>((a, b, c, d) => a.UpdateUser == d.Id)
.LeftJoin<SysStorageLocat>((a, b, c, d, e) => a.LocatNo == e.LocatNo)
- .LeftJoin<SysWareHouse>((a, b, c, d, e,f) => e.WareHouseNo == f.WareHouseNo)
+ .LeftJoin<SysWareHouse>((a, b, c, d, e,f) => a.WareHouseNo == f.WareHouseNo)
//.LeftJoin<BllBoxInfo>((a, b, c, d, e, f) => a.Id == e.BindNo)
.Select((a, b, c, d,e,f) => new PalletBindDto()
{
@@ -1375,7 +1375,7 @@
.AndIF(!string.IsNullOrWhiteSpace(layer), m => m.Layer == int.Parse(layer))
.AndIF(!string.IsNullOrWhiteSpace(locateNo), m => m.LocatNo.Contains(locateNo))
.And(m => m.IsDel == "0" && m.Status == "0" && m.Flag == "0" && m.WareHouseNo == houseNo)
- .And(m => m.AreaNo == categoryAreaNo)
+ .And(m => categoryAreaNo.Contains(m.AreaNo))
.ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
var total = 0;
var list = Db.Queryable<SysStorageLocat>().Where(item).OrderByDescending(a => a.Depth).OrderBy(a => a.Column)
@@ -1949,6 +1949,8 @@
Db.Updateable(bindModel).ExecuteCommand();
asnNo = stockModel.ASNNo;
}
+
+
}
}
foreach (DataStockDetail stockModel in stockDetail)
diff --git a/Wms/WMS.BLL/BllQualityServer/InspectionRequestServer.cs b/Wms/WMS.BLL/BllQualityServer/InspectionRequestServer.cs
index 616764b..54187e7 100644
--- a/Wms/WMS.BLL/BllQualityServer/InspectionRequestServer.cs
+++ b/Wms/WMS.BLL/BllQualityServer/InspectionRequestServer.cs
@@ -5,6 +5,7 @@
using Newtonsoft.Json;
using SqlSugar;
using System;
+using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
@@ -204,41 +205,56 @@
Db.Insertable(exTask).ExecuteCommand();
- // 璋冪敤Limes鎺ュ彛鍙戣捣璇烽獙
- var jsonData = JsonConvert.SerializeObject(QcNoModel);
- string response = "";
- try
- {
- var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
- response = HttpHelper.DoPost(url, jsonData, "涓婁紶ERP鍙栨牱娑堣�楅噺杩囪处", "ERP");
- var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
+ List<string> list1 = new List<string>();
+ list1.Add(taskNo);
+ //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
+ var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
+ var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
+ new TaskServer().EditTaskIssueOk(list1, time1, time2);
- ////瑙ｆ瀽杩斿洖鏁版嵁
- var limesModel = JsonConvert.DeserializeObject<LimesModel>(response);
- List<string> list1 = new List<string>();
- list1.Add(taskNo);
- if (limesModel.Success == 0)
- {
- //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
- new TaskServer().EditTaskIssueOk(list1, time1, time2);
+ // 鏇存柊璇烽獙鍗曚俊鎭�
+ data.Status = "2";
+ data.UpdateTime = time;
+ data.UpdateUser = userId;
- // 鏇存柊璇烽獙鍗曚俊鎭�
- data.Status = "2";
- data.UpdateTime = time;
- data.UpdateUser = userId;
+ Db.Updateable(data).ExecuteCommand();
- Db.Updateable(data).ExecuteCommand();
- }
- if (limesModel.Success == -1)
- {
- new TaskServer().EditTaskIssueNo(list1, time1, time2, limesModel.Message);
- throw new Exception(limesModel.Message);
- }
- }
- catch (Exception ex)
- {
- throw new Exception(ex.Message);
- }
+
+ // 璋冪敤ERP鎺ュ彛鍥炰紶鍙栨牱娑堣��
+ //var jsonData = JsonConvert.SerializeObject(QcNoModel);
+ //string response = "";
+ //try
+ //{
+ // var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
+ // response = HttpHelper.DoPost(url, jsonData, "涓婁紶ERP鍙栨牱娑堣�楅噺杩囪处", "ERP");
+ // var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
+
+ // ////瑙ｆ瀽杩斿洖鏁版嵁
+ // var limesModel = JsonConvert.DeserializeObject<LimesModel>(response);
+ // List<string> list1 = new List<string>();
+ // list1.Add(taskNo);
+ // if (limesModel.Success == 0)
+ // {
+ // //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
+ // new TaskServer().EditTaskIssueOk(list1, time1, time2);
+
+ // // 鏇存柊璇烽獙鍗曚俊鎭�
+ // data.Status = "2";
+ // data.UpdateTime = time;
+ // data.UpdateUser = userId;
+
+ // Db.Updateable(data).ExecuteCommand();
+ // }
+ // if (limesModel.Success == -1)
+ // {
+ // new TaskServer().EditTaskIssueNo(list1, time1, time2, limesModel.Message);
+ // throw new Exception(limesModel.Message);
+ // }
+ //}
+ //catch (Exception ex)
+ //{
+ // throw new Exception(ex.Message);
+ //}
//娣诲姞鎿嶄綔鏃ュ織璁板綍
var k = new OperationCrServer().AddLogOperationCr("璐ㄩ噺绠＄悊", "璐ㄦ璇烽獙", model.Code, "鍏冲崟", $"鍏抽棴浜唟model.Code}璇烽獙鍗�!", userId);
diff --git a/Wms/WMS.Entity/BllAsnEntity/BllBoxInfo.cs b/Wms/WMS.Entity/BllAsnEntity/BllBoxInfo.cs
index 596ea97..15eb35b 100644
--- a/Wms/WMS.Entity/BllAsnEntity/BllBoxInfo.cs
+++ b/Wms/WMS.Entity/BllAsnEntity/BllBoxInfo.cs
@@ -220,14 +220,14 @@
/// Default:
/// Nullable:True
/// </summary>
- public int QtyCount { get; set; }
+ public int? QtyCount { get; set; }
/// <summary>
/// Desc:绗嚑浠�
/// Default:
/// Nullable:True
/// </summary>
- public int QtyOrd { get; set; }
+ public int? QtyOrd { get; set; }
}
}
diff --git a/Wms/Wms/Controllers/BllAsnController.cs b/Wms/Wms/Controllers/BllAsnController.cs
index c2960f3..b4e38cc 100644
--- a/Wms/Wms/Controllers/BllAsnController.cs
+++ b/Wms/Wms/Controllers/BllAsnController.cs
@@ -513,7 +513,8 @@
{
try
{
- var models = _PalletBindSvc.GetLocateList("W01", model.RoadwayNo, model.Row, model.Column, model.Layer, model.LocateNo, model.StockDetailId, model.Page, model.Limit, out int count);
+ var models = _PalletBindSvc.GetLocateList("W01", model.RoadwayNo, model.Row, model.Column, model.Layer, model.LocateNo,
+ model.StockDetailId, model.Page, model.Limit, out int count);
return Ok(new { code = 0, count, msg = "鑾峰彇鎸囧畾鍌ㄤ綅淇℃伅", data = models });
}
--
Gitblit v1.8.0