From fe2b27527084667a15c424ffba00052cbf35ef7f Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期一, 15 七月 2024 11:45:30 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
Wms/WMS.BLL/BllCheckServer/StockCheckLogServer.cs | 94 +--
Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs | 4
Wms/WMS.BLL/BllCheckServer/StockFreectSetve.cs | 185 ++-----
Wms/Wms/Controllers/BllCheckController.cs | 40
Wms/WMS.IBLL/ILogServer/IOperationCRServer.cs | 5
Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs | 7
HTML/views/SOSetting/ExportNoticeEditFrom.html | 26
HTML/views/SOSetting/ExportNoticeAddFrom.html | 25
Wms/WMS.IBLL/IBllCheckServer/IStockCheckLogServer.cs | 8
Wms/WMS.IBLL/IBllSoServer/IExportNoticeDetailServer.cs | 5
HTML/views/SOSetting/ExportNotice.html | 29
HTML/views/WareHouseSetting/StorageLegend.html | 171 ++++++
Wms/WMS.BLL/LogServer/TaskServer.cs | 11
Wms/WMS.BLL/BllSoServer/ExportNoticeDetailServer.cs | 17
Wms/WMS.IBLL/ILogServer/ITaskServer.cs | 4
Wms/Wms/Controllers/BllAsnController.cs | 5
Wms/WMS.BLL/LogServer/OperationCrServer.cs | 13
Wms/Model/ModelVm/SysVm/LocateVm.cs | 1
HTML/views/WareHouseSetting/Locate.html | 88 +++
HTML/views/WareHouseSetting/LocateAddFrom.html | 308 ++++++++++++
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 29
Wms/WMS.IBLL/IBllCheckServer/IWarehouseOutsidePalletsServer.cs | 6
Wms/WMS.IBLL/IBllCheckServer/IStockFreectSetve.cs | 9
Wms/Wms/Controllers/SysController.cs | 14
Wms/WMS.BLL/SysServer/StorageLocatServer.cs | 11
Wms/Wms/Controllers/BllSoController.cs | 39
Wms/WMS.BLL/BllCheckServer/WarehouseOutsidePalletsServer.cs | 310 +++++------
27 files changed, 927 insertions(+), 537 deletions(-)
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index b01f45e..0568bea 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -62,33 +62,14 @@
<div class="layui-input-inline">
<select name="Type" id="Type" lay-filter="Type" lay-search>
<option value=""></option>
- <!-- 23 -->
+ <!--JC26-->
<option value="0">鎴愬搧鍑哄簱</option>
<option value="1">棰嗘枡鍑哄簱</option>
<option value="2">鎶芥鍑哄簱</option>
<option value="4">涓嶅悎鏍煎搧鍑哄簱</option>
- <option value="6">浠ｅ偍鍑哄簱</option>
- <option value="7">鍏朵粬鍑哄簱</option>
- <!-- 24 -->
- <!-- <option value="0">鎴愬搧鍑哄簱</option>
- <option value="1">棰嗘枡鍑哄簱</option>
- <option value="2">鎶芥鍑哄簱</option>
- <option value="3">鐗╂枡鍙栨牱鍑哄簱</option>
- <option value="4">涓嶅悎鏍煎搧鍑哄簱</option>
- <option value="5">涓棿鍝佸嚭搴�</option>
- <option value="6">浠ｅ偍鍑哄簱</option>
- <option value="7">鍏朵粬鍑哄簱</option>
- <option value="8">瀵勫瓨鍑哄簱</option> -->
- <!-- 09 -->
- <!-- <option value="0">鏍囧噯閿�鍞嚭搴�</option>
- <option value="1">闈炴爣閿�鍞嚭搴�</option>
- <option value="2">鏍囧噯璋冩嫧鍑哄簱</option>
- <option value="3">闈炴爣璋冩嫧鍑哄簱</option> -->
- <!-- 08 -->
- <!-- <option value="0">鎴愬搧鍑哄簱</option>
- <option value="1">鍘熻緟鏂欏嚭搴�</option>
- <option value="2">涓嶅悎鏍煎搧鍑哄簱</option>
- <option value="3">鍙栨牱鍑哄簱</option> -->
+ <option value="5">涓棿鍝佸嚭搴�</option>
+ <!-- <option value="7">鍏朵粬鍑哄簱</option> -->
+ <option value="9">閲囪喘閫�璐у嚭搴�</option>
</select>
</div>
</div>
@@ -228,6 +209,8 @@
return "鍏朵粬鍑哄簱";
case "8":
return "瀵勫瓨鍑哄簱";
+ case "9":
+ return "閲囪喘閫�璐у嚭搴�";
default:
return "";
}
diff --git a/HTML/views/SOSetting/ExportNoticeAddFrom.html b/HTML/views/SOSetting/ExportNoticeAddFrom.html
index 0a0b1f1..95df954 100644
--- a/HTML/views/SOSetting/ExportNoticeAddFrom.html
+++ b/HTML/views/SOSetting/ExportNoticeAddFrom.html
@@ -33,33 +33,14 @@
<div class="layui-input-inline">
<select name="Type" id="Type" lay-filter="Type" lay-verify="required" lay-search>
<!-- <option value=""></option> -->
- <!-- 23 -->
+ <!--JC26-->
<option value="0">鎴愬搧鍑哄簱</option>
<option value="1">棰嗘枡鍑哄簱</option>
<option value="2">鎶芥鍑哄簱</option>
<option value="4">涓嶅悎鏍煎搧鍑哄簱</option>
- <option value="6">浠ｅ偍鍑哄簱</option>
- <option value="7">鍏朵粬鍑哄簱</option>
- <!-- 24 -->
- <!-- <option value="0">鎴愬搧鍑哄簱</option>
- <option value="1">棰嗘枡鍑哄簱</option>
- <option value="2">鎶芥鍑哄簱</option>
- <option value="3">鐗╂枡鍙栨牱鍑哄簱</option>
- <option value="4">涓嶅悎鏍煎搧鍑哄簱</option>
<option value="5">涓棿鍝佸嚭搴�</option>
- <option value="6">浠ｅ偍鍑哄簱</option>
- <option value="7">鍏朵粬鍑哄簱</option>
- <option value="8">瀵勫瓨鍑哄簱</option> -->
- <!-- 09 -->
- <!-- <option value="0">鏍囧噯閿�鍞嚭搴�</option>
- <option value="1">闈炴爣閿�鍞嚭搴�</option>
- <option value="2">鏍囧噯璋冩嫧鍑哄簱</option>
- <option value="3">闈炴爣璋冩嫧鍑哄簱</option> -->
- <!-- 08 -->
- <!-- <option value="0">鎴愬搧鍑哄簱</option>
- <option value="1">鍘熻緟鏂欏嚭搴�</option>
- <option value="2">涓嶅悎鏍煎搧鍑哄簱</option>
- <option value="3">鍙栨牱鍑哄簱</option> -->
+ <!-- <option value="7">鍏朵粬鍑哄簱</option> -->
+ <option value="9">閲囪喘閫�璐у嚭搴�</option>
</select>
</div>
</div>
diff --git a/HTML/views/SOSetting/ExportNoticeEditFrom.html b/HTML/views/SOSetting/ExportNoticeEditFrom.html
index b6dc461..73e2f4d 100644
--- a/HTML/views/SOSetting/ExportNoticeEditFrom.html
+++ b/HTML/views/SOSetting/ExportNoticeEditFrom.html
@@ -26,34 +26,14 @@
<div class="layui-input-inline">
<select name="Type" id="Type" lay-filter="Type" lay-verify="required" disabled lay-search>
<option value=""></option>
- <!-- 23 -->
+ <!--JC26-->
<option value="0">鎴愬搧鍑哄簱</option>
<option value="1">棰嗘枡鍑哄簱</option>
<option value="2">鎶芥鍑哄簱</option>
<option value="4">涓嶅悎鏍煎搧鍑哄簱</option>
- <option value="6">浠ｅ偍鍑哄簱</option>
- <option value="7">鍏朵粬鍑哄簱</option>
- <!-- 24 -->
- <!-- <option value="0">鎴愬搧鍑哄簱</option>
- <option value="1">棰嗘枡鍑哄簱</option>
- <option value="2">鎶芥鍑哄簱</option>
- <option value="3">鐗╂枡鍙栨牱鍑哄簱</option>
- <option value="4">涓嶅悎鏍煎搧鍑哄簱</option>
<option value="5">涓棿鍝佸嚭搴�</option>
- <option value="6">浠ｅ偍鍑哄簱</option>
- <option value="7">鍏朵粬鍑哄簱</option>
- <option value="8">瀵勫瓨鍑哄簱</option> -->
- <!-- 09 -->
- <!-- <option value="0">鎴愬搧鍑哄簱</option>
- <option value="1">鍘熸枡鍑哄簱</option>
- <option value="2">鎴愬搧涓嶅悎鏍煎嚭搴�</option>
- <option value="3">鍘熸枡涓嶅悎鏍煎嚭搴�</option>
- <option value="4">璐ㄦ鍑哄簱</option> -->
- <!-- 08 -->
- <!-- <option value="0">鎴愬搧鍑哄簱</option>
- <option value="1">鍘熻緟鏂欏嚭搴�</option>
- <option value="2">涓嶅悎鏍煎搧鍑哄簱</option>
- <option value="3">鍙栨牱鍑哄簱</option> -->
+ <!-- <option value="7">鍏朵粬鍑哄簱</option> -->
+ <option value="9">閲囪喘閫�璐у嚭搴�</option>
</select>
</div>
</div>
diff --git a/HTML/views/WareHouseSetting/Locate.html b/HTML/views/WareHouseSetting/Locate.html
index 9f52be6..47e5016 100644
--- a/HTML/views/WareHouseSetting/Locate.html
+++ b/HTML/views/WareHouseSetting/Locate.html
@@ -115,6 +115,11 @@
<i class="layui-icon layui-icon-edit layuiadmin-button-btn"> </i>鎵归噺缂栬緫
</button>
</div>
+ <div class="layui-inline">
+ <button style="margin-right: 5px;" class="layui-btn layui-btn-sm layuiadmin-btn-list addClass" data-type="addList" lay-event="add" >
+ <i class="layui-icon"></i>娣诲姞
+ </button>
+ </div>
</div>
</div>
<div id="center"></div>
@@ -255,8 +260,83 @@
submit.trigger('click');
}
});
- }
+ },
+ addList: function () {
+
+ layer.open({
+ type: 2,
+ title: '娣诲姞鍌ㄤ綅淇℃伅',
+ content: 'LocateAddFrom.html',
+ maxmin: true,
+ area: ['560px', '510px'],
+ btn: ['纭畾', '鍙栨秷'],
+ yes: function (index1, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index1],
+ submitID = 'layuiadmin-app-form-submit',
+ submit = layero.find('iframe').contents().find('#' + submitID);
+ //鐩戝惉鎻愪氦
+ iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+ var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
+ console.log(field);
+ // var msg = [];
+ // for (var i = 0; i < checkData.length; i++) {
+ // // msg.push(checkData[i].Id);
+ // msg.push(checkData[i].Id)
+ // }
+ // console.log(msg);
+
+ //鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
+ var param = {
+ // Id: msg,
+ Index:Number(field.IndexRow),
+ HouseNo:field.HouseNo,
+ RoadwayNo:field.RoadwayNo,
+ AreaNo:field.AreaNo,
+ Row:Number(field.Row),
+ Col:Number(field.Col),
+ Layer:Number(field.Layer),
+ Depth:field.Depth,
+ };
+ console.log(param)
+ if (doing) {
+ doing = false;
+ sendData(IP + "/Sys/AddStorageLocat", param, 'post', function (res) {
+ console.log(res);
+ if (res.code == 200) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ tableIns.reload({
+ page: {
+ curr: 1
+ }
+ });
+ layer.close(index1); //鍏抽棴寮瑰眰
+ doing = true;
+ });
+ } else if(res.code == 1){
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {doing = true;});
+ } else { //涓嶆垚鍔�
+ layer.msg(res.statusText, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {doing = true;});
+ }
+ });
+ }
+
+ //$.ajax({});
+ });
+ submit.trigger('click');
+ }
+ });
+ },
};
+
$('.layui-btn.layuiadmin-btn-list').on('click', function () {
var type = $(this).data('type');
active[type] ? active[type].call(this) : '';
@@ -290,6 +370,7 @@
done: function() {
$(function() {
$(".editClass").hide();
+ $(".addClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
if (res.code == 0) { //鎴愬姛
@@ -299,6 +380,11 @@
$(".editClass").show();
});
}
+ if (res.data[k].MenuName == "娣诲姞鍌ㄤ綅") {
+ $(function() {
+ $(".addClass").show();
+ });
+ }
}
} else { //涓嶆垚鍔�
layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
diff --git a/HTML/views/WareHouseSetting/LocateAddFrom.html b/HTML/views/WareHouseSetting/LocateAddFrom.html
new file mode 100644
index 0000000..4c4b6ac
--- /dev/null
+++ b/HTML/views/WareHouseSetting/LocateAddFrom.html
@@ -0,0 +1,308 @@
+<!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-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-inline">
+ <input type="number" id="IndexRow" name="IndexRow" placeholder="褰撳墠鎺捖仿仿�" autocomplete="off"
+ class="layui-input" >
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎵�灞炰粨搴�</label>
+ <div class="layui-input-inline">
+ <select name="HouseNo" id="HouseNo" lay-verify="" lay-search >
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎵�灞炲贩閬�</label>
+ <div class="layui-input-inline">
+ <select name="RoadwayNo" id="RoadwayNo" lay-filter="getRoadwayNo" lay-search >
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎵�灞炲尯鍩�</label>
+ <div class="layui-input-inline">
+ <select name="AreaNo" id="AreaNo" lay-filter="getAreaNo" lay-search>
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎺掓�绘暟</label>
+ <div class="layui-input-inline">
+ <input type="number" id="Row" name="Row" placeholder="鎺捖仿仿�" autocomplete="off"
+ class="layui-input" >
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍒楁�绘暟</label>
+ <div class="layui-input-inline">
+ <input type="number" id="Col" name="Col" placeholder="鍒椔仿仿�" autocomplete="off"
+ class="layui-input" >
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">灞傛�绘暟</label>
+ <div class="layui-input-inline">
+ <input type="number" id="Layer" name="Layer" placeholder="灞偮仿仿�" autocomplete="off"
+ class="layui-input" >
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">娣卞害</label>
+ <div class="layui-input-inline">
+ <input type="number" id="Depth" name="Depth" placeholder="娣卞害路路路" autocomplete="off"
+ class="layui-input" >
+ </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="纭缂栬緫">
+ </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>
+ var uid = $.cookie('userId');
+ if(uid==null){
+ alert('璇风櫥褰曞悗鎿嶄綔');
+ window.parent.location.href='../Login.html'
+ }
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'layer'], function() {
+ var $ = layui.$,
+ form = layui.form,
+ layer = layui.layer;
+
+ // if(getQueryString('id') != null)
+ // {
+ // sendData(IP + "/Sys/GetStorageLocat", param, 'post', function(res) {
+ // if (res.code == 0) {
+ // // $("input[name=Id]").val(res.data.Id);
+ // GetHouse(res.data.HouseNo)
+ // GetArea(res.data.AreaNo,res.data.HouseNo)
+ // GetRoadway(res.data.RoadwayNo)
+ // GetTemp(res.data.Temperature);
+ // $("input[name=Row]").val(res.data.Row);
+ // $("input[name=Col]").val(res.data.Col);
+ // $("input[name=Layer]").val(res.data.Layer);
+ // $("input[name=Depth]").val(res.data.Depth);
+
+ // $("input[name=LocatNo]").val(res.data.LocatNo);
+ // $("input[name=Height]").val(res.data.Height);
+ // $("input[name=Weight]").val(res.data.Weight);
+ // $("select[name='Status']").val(res.data.Status);
+ // $("select[name='Flag']").val(res.data.Flag);
+ // form.render();
+ // } else {
+ // Layer.msg(res.msg, {
+ // icon: 2,
+ // time: 2000
+ // }, function() {});
+ // }
+ // });
+ // }else{
+ // }
+ // GetHouse()
+ // GetArea()
+ // GetRoadway()
+ // GetTemp();
+
+ //鑾峰彇浠撳簱
+ // function GetHouse(){
+ // sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function(res) {
+ // if (res.code == 0) { //鎴愬姛
+ // $("#RoadwayNo").empty();
+ // for (var i = 0; i < res.data.length; i++) {
+ // $("#HouseNo").append('<option value =' + res.data[i].HouseNo + '>' + res.data[i].HouseNo + '-' +
+ // res.data[i].WareHouseName + '</option>');
+ // }
+ // // $("select[name='HouseNo']").val(val);
+ // form.render('select');
+ // } else { //涓嶆垚鍔�
+ // Layer.msg(res.msg, {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // }, function() {});
+ // }
+ // });
+ //鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
+ sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function(res) {
+ console.log(2)
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#HouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
+ res.data[i].WareHouseName + '</option>');
+ }
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {});
+ }
+ });
+
+
+ //鑾峰彇 宸烽亾涓嬫媺妗�
+ synData(IP + "/Sys/GetStorageRoadwayByHouseNo", {}, 'get', function(res) {
+ $("#RoadwayNo").empty();
+ $("#RoadwayNo").append('<option value =""></option>');
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' + res.data[i].RoadwayNo + '-' +
+ res.data[i].RoadwayName + '</option>');
+ }
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇宸烽亾淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ //鍥炶皟
+ form.render('select');
+ });
+ }
+ });
+ //鑾峰彇 鍖哄煙涓嬫媺妗�
+ synData(IP + "/Sys/GetStorageAreaByHouseNo", {}, 'get', function(res) {
+ $("#AreaNo").empty();
+ $("#AreaNo").append('<option value =""></option>');
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' + res.data[i].AreaNo + '-' +
+ res.data[i].AreaName + '</option>');
+ }
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇鍖哄煙淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ //鍥炶皟
+ form.render('select');
+ });
+ }
+ });
+
+ // }
+ //鑾峰彇鍖哄煙
+ function GetArea(){
+ var a = $("#HouseNo").val();
+ // if (wareHouse != null)
+ // {
+ // a = wareHouse;
+ // }
+ sendData(IP + "/Sys/GetStorageAreaByHouseNo?HouseNo="+a, {}, 'get', function(res) {
+ console.log(res)
+ if (res.code == 0) { //鎴愬姛
+ $("#AreaNo").empty();
+ for (var i = 0; i < res.data.length; i++) {
+ $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' + res.data[i].AreaNo + '-' +
+ res.data[i].AreaName + '</option>');
+ }
+ // $("select[name='AreaNo']").val(val);
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ Layer.msg('鑾峰彇鍖哄煙淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ //鍥炶皟
+ form.render('select');
+ });
+ }
+ });
+ }
+ //鑾峰彇宸烽亾
+ function GetRoadway(val){
+ sendData(IP + "/Sys/GetStorageRoadwayByHouseNo", {}, 'get', function(res) {
+
+ if (res.code == 0) { //鎴愬姛
+ $("#RoadwayNo").empty();
+ for (var i = 0; i < res.data.length; i++) {
+ $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' + res.data[i].RoadwayNo + '-' +
+ res.data[i].RoadwayName + '</option>');
+ }
+ $("select[name='RoadwayNo']").val(val);
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ Layer.msg('鑾峰彇宸烽亾淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ //鍥炶皟
+ form.render('select');
+ });
+ }
+ });
+ }
+ //鑾峰彇瀛樺偍鐜
+ function GetTemp(temp){
+
+ sendData(IP + "/Sys/GetDictionaryByParentNo?parentNo="+"Temperature", {}, 'get', function(res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#Temp").append('<option value =' + res.data[i].Id + '>' +
+ res.data[i].DictName + '</option>');
+ }
+
+ $("select[name='Temp']").val(temp);
+
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ Layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {});
+ }
+ });
+
+ }
+
+
+ //鑾峰彇娴忚鍣ㄥ弬鏁�
+ 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>
diff --git a/HTML/views/WareHouseSetting/StorageLegend.html b/HTML/views/WareHouseSetting/StorageLegend.html
index 8607efe..0280638 100644
--- a/HTML/views/WareHouseSetting/StorageLegend.html
+++ b/HTML/views/WareHouseSetting/StorageLegend.html
@@ -85,7 +85,7 @@
.btnShow {
- width: 20px;
+ width: 17px;
height: 15px;
cursor: pointer;
}
@@ -266,7 +266,116 @@
});
//宸烽亾鍙樻洿
form.on('select(getRoadwayNo)', function (data) {
+ if (data.value == "R01")
+ {
+ xianga = "宸烽亾1鎺�";
+ xiangb = "宸烽亾2鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='1']").attr("selected", "selected")
+ $("#Row").append('<option value =1>绗�1鎺�</option>');
+ $("#Row").append('<option value =2>绗�2鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R02")
+ {
+ xianga = "宸烽亾3鎺�";
+ xiangb = "宸烽亾4鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='3']").attr("selected", "selected")
+ $("#Row").append('<option value =3>绗�3鎺�</option>');
+ $("#Row").append('<option value =4>绗�4鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R03")
+ {
+
+ xianga = "宸烽亾5鎺�";
+ xiangb = "宸烽亾6鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='5']").attr("selected", "selected")
+ $("#Row").append('<option value =5>绗�5鎺�</option>');
+ $("#Row").append('<option value =6>绗�6鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R04")
+ {
+
+ xianga = "宸烽亾7鎺�";
+ xiangb = "宸烽亾8鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='7']").attr("selected", "selected")
+ $("#Row").append('<option value =7>绗�7鎺�</option>');
+ $("#Row").append('<option value =8>绗�8鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R05")
+ {
+
+ xianga = "宸烽亾9鎺�";
+ xiangb = "宸烽亾10鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='9']").attr("selected", "selected")
+ $("#Row").append('<option value =9>绗�9鎺�</option>');
+ $("#Row").append('<option value =10>绗�10鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R06")
+ {
+
+ xianga = "宸烽亾11鎺�";
+ xiangb = "宸烽亾12鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='11']").attr("selected", "selected")
+ $("#Row").append('<option value =11>绗�11鎺�</option>');
+ $("#Row").append('<option value =12>绗�12鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R07")
+ {
+
+ xianga = "宸烽亾13鎺�";
+ xiangb = "宸烽亾14鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='13']").attr("selected", "selected")
+ $("#Row").append('<option value =13>绗�13鎺�</option>');
+ $("#Row").append('<option value =14>绗�14鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R08")
+ {
+
+ xianga = "宸烽亾15鎺�";
+ xiangb = "宸烽亾16鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='15']").attr("selected", "selected")
+ $("#Row").append('<option value =15>绗�15鎺�</option>');
+ $("#Row").append('<option value =16>绗�16鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R09")
+ {
+
+ xianga = "宸烽亾17鎺�";
+ xiangb = "宸烽亾18鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='17']").attr("selected", "selected")
+ $("#Row").append('<option value =17>绗�17鎺�</option>');
+ $("#Row").append('<option value =18>绗�18鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R10")
+ {
+
+ xianga = "宸烽亾19鎺�";
+ xiangb = "宸烽亾20鎺�";
+ $("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Row option[value ='19']").attr("selected", "selected")
+ $("#Row").append('<option value =19>绗�19鎺�</option>');
+ $("#Row").append('<option value =20>绗�20鎺�</option>');
+ form.render('select');
+ }
getRow(); //鑾峰彇宸烽亾涓帓
+ GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val()); //鑾峰彇鏌辩姸淇℃伅
})
//鎺掑彉鏇�
form.on('select(SelectRow)', function (data) {
@@ -327,6 +436,64 @@
$("#RoadwayNo option[value='" + res.data[0].RoadwayNo + "']").attr("selected", "selected")
$("#Depth option[value ='01']").attr("selected", "selected")
form.render('select');
+ if ($("#RoadwayNo").val() == "R01")
+ {
+ xianga = "宸烽亾1鎺�";
+ xiangb = "宸烽亾2鎺�";
+ $("#Row option[value ='1']").attr("selected", "selected")
+ $("#Row").append('<option value =1>绗�1鎺�</option>');
+ $("#Row").append('<option value =2>绗�2鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R02")
+ {
+ xianga = "宸烽亾3鎺�";
+ xiangb = "宸烽亾4鎺�";
+ $("#Row option[value ='3']").attr("selected", "selected")
+ $("#Row").append('<option value =3>绗�3鎺�</option>');
+ $("#Row").append('<option value =4>绗�4鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R03")
+ {
+
+ xianga = "宸烽亾5鎺�";
+ xiangb = "宸烽亾6鎺�";
+ $("#Row option[value ='5']").attr("selected", "selected")
+ $("#Row").append('<option value =5>绗�5鎺�</option>');
+ $("#Row").append('<option value =6>绗�6鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R04")
+ {
+
+ xianga = "宸烽亾7鎺�";
+ xiangb = "宸烽亾8鎺�";
+ $("#Row option[value ='7']").attr("selected", "selected")
+ $("#Row").append('<option value =7>绗�7鎺�</option>');
+ $("#Row").append('<option value =8>绗�8鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R05")
+ {
+
+ xianga = "宸烽亾9鎺�";
+ xiangb = "宸烽亾10鎺�";
+ $("#Row option[value ='9']").attr("selected", "selected")
+ $("#Row").append('<option value =9>绗�9鎺�</option>');
+ $("#Row").append('<option value =10>绗�10鎺�</option>');
+ form.render('select');
+ }
+ else if ($("#RoadwayNo").val() == "R06")
+ {
+
+ xianga = "宸烽亾11鎺�";
+ xiangb = "宸烽亾12鎺�";
+ $("#Row option[value ='11']").attr("selected", "selected")
+ $("#Row").append('<option value =11>绗�11鎺�</option>');
+ $("#Row").append('<option value =12>绗�12鎺�</option>');
+ form.render('select');
+ }
getRow(); //鑾峰彇鎺�
GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val()); //鑾峰彇鏌辩姸淇℃伅
} else { //涓嶆垚鍔�
@@ -624,7 +791,7 @@
type: 'shadow'
}
},
- // legend: {
+ // legend: { //椤堕儴鍒楄〃
// data: ['绌哄偍浣�','鏈夌墿鍝�','鍏ュ簱涓�','鍑哄簱涓�','绉诲叆涓�','绉诲嚭涓�']
// },
xAxis: [
diff --git a/Wms/Model/ModelVm/SysVm/LocateVm.cs b/Wms/Model/ModelVm/SysVm/LocateVm.cs
index f50f8ab..82cfbc0 100644
--- a/Wms/Model/ModelVm/SysVm/LocateVm.cs
+++ b/Wms/Model/ModelVm/SysVm/LocateVm.cs
@@ -11,6 +11,7 @@
/// </summary>
public class AddLocateVm
{
+ public int Index { get; set; }
public string HouseNo { get; set; }
public string RoadwayNo { get; set; }
public string AreaNo { get; set; }
diff --git a/Wms/WMS.BLL/BllCheckServer/StockCheckLogServer.cs b/Wms/WMS.BLL/BllCheckServer/StockCheckLogServer.cs
index 13d61d0..16896bb 100644
--- a/Wms/WMS.BLL/BllCheckServer/StockCheckLogServer.cs
+++ b/Wms/WMS.BLL/BllCheckServer/StockCheckLogServer.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq.Expressions;
using System.Text;
+using System.Threading.Tasks;
using Model.ModelDto.BllCheckDto;
using SqlSugar;
using WMS.DAL;
@@ -12,7 +13,7 @@
namespace WMS.BLL.BllCheckServer
{
- public class StockCheckLogServer:DbHelper<BllStockCheckLog>,IStockCheckLogServer
+ public class StockCheckLogServer : DbHelper<BllStockCheckLog>, IStockCheckLogServer
{
private static readonly SqlSugarScope Db = DataContext.Db;
public StockCheckLogServer() : base(Db)
@@ -20,59 +21,50 @@
}
//鑾峰彇鐩樼偣璁板綍
- public List<StockCheckLogDto> GetStockCheckLogList(string crNo, string status, string palletNo, string boxNo, string skuNo, string skuName, string lotNo, int page, int limit, out int count)
+ public async Task<List<StockCheckLogDto>> GetStockCheckLogList(string crNo, string status, string palletNo, string boxNo, string skuNo, string skuName, string lotNo, int page, int limit, RefAsync<int> count)
{
- try
- {
- Expression<Func<BllStockCheckLog, bool>> item = Expressionable.Create<BllStockCheckLog>()
- .AndIF(!string.IsNullOrWhiteSpace(crNo), m => m.CRNo.Contains(crNo.Trim()))
- .AndIF(!string.IsNullOrWhiteSpace(status), m => m.CheckResult == int.Parse(status))
- .AndIF(!string.IsNullOrWhiteSpace(palletNo), m => m.PalletNo.Contains(palletNo.Trim()))
- .AndIF(!string.IsNullOrWhiteSpace(boxNo), m => m.BoxNo.Contains(boxNo.Trim()))
- .AndIF(!string.IsNullOrWhiteSpace(skuNo), m => m.SkuNo.Contains(skuName.Trim()))
- .AndIF(!string.IsNullOrWhiteSpace(skuName), m => m.SkuName.Contains(lotNo.Trim()))
- .AndIF(!string.IsNullOrWhiteSpace(lotNo), m => m.LotNo.Contains(lotNo.Trim()))
- .And(m => m.IsDel == "0")
- .ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
- var total = 0;
- var list = GetAllWhereAsync(item)
- .LeftJoin<SysUserInfor>((a, b) => a.CheckUserId == b.Id)
- .LeftJoin<SysUserInfor>((a, b,c) => a.CreateUser == c.Id)
- .LeftJoin<SysUserInfor>((a, b, c,d) => a.UpdateUser == d.Id)
- .Select((a, b, c,d) => new StockCheckLogDto()
- {
- Id = a.Id,
- CrNo = a.CRNo,
- PalletNo = a.PalletNo,
- BoxNo = a.BoxNo,
- BoxNo2 = a.BoxNo2,
- BoxNo3 = a.BoxNo3,
- Qty = a.Qty,
- RealQty = a.RealQty,
- CheckDate = a.CheckDate,
- CheckResult = a.CheckResult,
- CheckUserName = b.RealName,
- SkuNo = a.SkuNo,
- SkuName = a.SkuName,
- Standard = a.Standard,
- LotNo = a.LotNo,
- LotText = a.LotText,
- SupplierLot = a.SupplierLot,
-
- CreateUserName = c.RealName,
- UpdateUserName = d.RealName,
- CreateTime = a.CreateTime,
- UpdateTime = a.UpdateTime,
+ Expression<Func<BllStockCheckLog, bool>> item = Expressionable.Create<BllStockCheckLog>()
+ .AndIF(!string.IsNullOrWhiteSpace(crNo), m => m.CRNo.Contains(crNo.Trim()))
+ .AndIF(!string.IsNullOrWhiteSpace(status), m => m.CheckResult == int.Parse(status))
+ .AndIF(!string.IsNullOrWhiteSpace(palletNo), m => m.PalletNo.Contains(palletNo.Trim()))
+ .AndIF(!string.IsNullOrWhiteSpace(boxNo), m => m.BoxNo.Contains(boxNo.Trim()))
+ .AndIF(!string.IsNullOrWhiteSpace(skuNo), m => m.SkuNo.Contains(skuName.Trim()))
+ .AndIF(!string.IsNullOrWhiteSpace(skuName), m => m.SkuName.Contains(lotNo.Trim()))
+ .AndIF(!string.IsNullOrWhiteSpace(lotNo), m => m.LotNo.Contains(lotNo.Trim()))
+ .And(m => m.IsDel == "0")
+ .ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
+ var list = await GetAllWhereAsync(item)
+ .LeftJoin<SysUserInfor>((a, b) => a.CheckUserId == b.Id)
+ .LeftJoin<SysUserInfor>((a, b, c) => a.CreateUser == c.Id)
+ .LeftJoin<SysUserInfor>((a, b, c, d) => a.UpdateUser == d.Id)
+ .Select((a, b, c, d) => new StockCheckLogDto()
+ {
+ Id = a.Id,
+ CrNo = a.CRNo,
+ PalletNo = a.PalletNo,
+ BoxNo = a.BoxNo,
+ BoxNo2 = a.BoxNo2,
+ BoxNo3 = a.BoxNo3,
+ Qty = a.Qty,
+ RealQty = a.RealQty,
+ CheckDate = a.CheckDate,
+ CheckResult = a.CheckResult,
+ CheckUserName = b.RealName,
+ SkuNo = a.SkuNo,
+ SkuName = a.SkuName,
+ Standard = a.Standard,
+ LotNo = a.LotNo,
+ LotText = a.LotText,
+ SupplierLot = a.SupplierLot,
- }).OrderByDescending(a=>a.CreateTime).ToOffsetPage(page, limit, ref total);
- count = total;
+ CreateUserName = c.RealName,
+ UpdateUserName = d.RealName,
+ CreateTime = a.CreateTime,
+ UpdateTime = a.UpdateTime,
- return list;
- }
- catch (Exception e)
- {
- throw new Exception(e.Message);
- }
+ }).OrderByDescending(a => a.CreateTime).ToPageListAsync(page, limit, count);
+
+ return list;
}
#region 鏁版嵁褰掓。
diff --git a/Wms/WMS.BLL/BllCheckServer/StockFreectSetve.cs b/Wms/WMS.BLL/BllCheckServer/StockFreectSetve.cs
index 6e62780..dea5d04 100644
--- a/Wms/WMS.BLL/BllCheckServer/StockFreectSetve.cs
+++ b/Wms/WMS.BLL/BllCheckServer/StockFreectSetve.cs
@@ -5,6 +5,8 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
+using System.Threading.Tasks;
+using Utility;
using WMS.DAL;
using WMS.Entity.BllCheckEntity;
using WMS.Entity.Context;
@@ -23,20 +25,12 @@
#region 鍐荤粨\瑙ｅ喕
- public List<DataStock> ByTypeGetDataStockType(string SkuNo, int type)
+ public async Task<List<DataStock>> ByTypeGetDataStockType(string SkuNo, int type)
{
- try
- {
- var list = Db.Queryable<DataStock>().Where(a => a.IsDel == "0" && a.SkuNo != "100099" && type == 1 ? (a.Qty - a.LockQty - a.FrozenQty) > 0 : type == 2 ? a.FrozenQty > 0 : a.Id < 0).ToList();
- //var sku = Db.Queryable<SysMaterials>().WhereIF(!string.IsNullOrWhiteSpace(SkuNo), a => a.SkuNo.Contains(SkuNo)).Where(a => list.Contains(a.SkuNo)).ToList();
+ var list = await Db.Queryable<DataStock>().Where(a => a.IsDel == "0" && a.SkuNo != "100099" && type == 1 ? (a.Qty - a.LockQty - a.FrozenQty) > 0 : type == 2 ? a.FrozenQty > 0 : a.Id < 0).ToListAsync();
+ //var sku = Db.Queryable<SysMaterials>().WhereIF(!string.IsNullOrWhiteSpace(SkuNo), a => a.SkuNo.Contains(SkuNo)).Where(a => list.Contains(a.SkuNo)).ToList();
- return list;
- }
- catch (Exception ex)
- {
-
- throw ex;
- }
+ return list;
}
/// <summary>
@@ -44,59 +38,23 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- public List<FreezeUnfreezeInfoDto> GetDataFreezeList(FreezeUnfreezeInfoDto model)
+ public async Task<List<FreezeUnfreezeInfoDto>> GetDataFreezeList(FreezeUnfreezeInfoDto model)
{
- try
- {
- string str = "select info.SkuNo,info.SkuName,info.LotNo,info.LotText,info.SupplierLot,info.Qty,info.FrozenQty,info.Demo,info.status,info.Standard,info.Type,info.CreateTime,users.UserName from DataFreezeUnfreezeInfo info left join SysUserInfor users on info.CreateUser = users.Id where info.IsDel = '0' and users.IsDel = '0' and info.Status = 1";
- #region 楠岃瘉鏉′欢
- //楠岃瘉鐗╂枡鍙锋槸鍚︿负绌�
- if (!string.IsNullOrWhiteSpace(model.SkuNo))
- {
- str += $" and info.SkuNo like '%{model.SkuNo}%'";
- }
- //楠岃瘉鐗╂枡鍚嶇О鏄惁涓虹┖
- if (!string.IsNullOrWhiteSpace(model.SkuName))
- {
- str += $" and info.SkuName like '%{model.SkuName}%'";
- }
- //楠岃瘉鎵规鏄惁涓虹┖
- if (!string.IsNullOrWhiteSpace(model.LotNo))
- {
- str += $" and info.LotNo like '%{model.LotNo}%'";
- }
- // 楠岃瘉绫诲瀷鏄惁涓虹┖
- if (!string.IsNullOrWhiteSpace(model.Type))
- {
- str += $" and info.Type = '{model.Type}'";
- }
- // 楠岃瘉鍘熷洜鏄惁涓虹┖
- if (!string.IsNullOrWhiteSpace(model.Demo))
- {
- str += $" and info.Demo = '{model.Demo}'";
- }
- //楠岃瘉缁撴潫鏃堕棿鏄惁涓虹┖
- if (!string.IsNullOrWhiteSpace(model.StartTime))
- {
- str += $" and info.CreateTime < '{model.StartTime}'";
- }
- //楠岃瘉缁撴潫鏃堕棿鏄惁涓虹┖
- if (!string.IsNullOrWhiteSpace(model.EndTime))
- {
- model.EndTime = (DateTime.Parse(model.EndTime).AddDays(1)).ToString();
- str += $" and info.CreateTime < '{model.EndTime}'";
- }
- #endregion
-
- List<FreezeUnfreezeInfoDto> list = Db.Ado.SqlQuery<FreezeUnfreezeInfoDto>(str);
- return list;
-
- }
- catch (Exception ex)
- {
-
- throw ex;
- }
+ return await Db.Queryable<DataFreezeUnfreezeInfo>()
+ .LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
+ .Where(a => a.IsDel == "0" && a.Status == 1)
+ .WhereIF(!string.IsNullOrWhiteSpace(model.SkuNo), a => a.SkuNo.Contains(model.SkuNo))
+ .WhereIF(!string.IsNullOrWhiteSpace(model.SkuName), a => a.SkuName.Contains(model.SkuName))
+ .WhereIF(!string.IsNullOrWhiteSpace(model.LotNo), a => a.LotNo.Contains(model.LotNo))
+ .WhereIF(!string.IsNullOrWhiteSpace(model.Type), a => a.Type == model.Type)
+ .WhereIF(!string.IsNullOrWhiteSpace(model.Demo), a => a.Demo == model.Demo)
+ .WhereIF(!string.IsNullOrWhiteSpace(model.StartTime), a => SqlFunc.GreaterThanOrEqual(a.CreateTime, model.StartTime))
+ .WhereIF(!string.IsNullOrWhiteSpace(model.EndTime), a => SqlFunc.LessThanOrEqual(a.CreateTime, model.EndTime))
+ .Select<FreezeUnfreezeInfoDto>((a, b) => new FreezeUnfreezeInfoDto()
+ {
+ UserName = b.RealName
+ }, true)
+ .ToListAsync();
}
/// <summary>
@@ -104,59 +62,23 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- public List<FreezeUnfreezeInfoDto> GetDataUnFreezeList(FreezeUnfreezeInfoDto model)
+ public async Task<List<FreezeUnfreezeInfoDto>> GetDataUnFreezeList(FreezeUnfreezeInfoDto model)
{
- try
- {
- string str = "select info.SkuNo,info.SkuName,info.LotNo,info.LotText,info.SupplierLot,info.Qty,info.FrozenQty,info.Demo,info.status,info.Standard,info.Type,info.CreateTime,users.UserName from DataFreezeUnfreezeInfo info left join SysUserInfor users on info.CreateUser = users.Id where info.IsDel = '0' and users.IsDel = '0' and info.Status = 2";
-
- #region 楠岃瘉鏉′欢
- //楠岃瘉鐗╂枡鍙锋槸鍚︿负绌�
- if (!string.IsNullOrWhiteSpace(model.SkuNo))
- {
- str += $" and info.SkuNo like '%{model.SkuNo}%'";
- }
- //楠岃瘉鐗╂枡鍚嶇О鏄惁涓虹┖
- if (!string.IsNullOrWhiteSpace(model.SkuName))
- {
- str += $" and info.SkuName like '%{model.SkuName}%'";
- }
- //楠岃瘉鎵规鏄惁涓虹┖
- if (!string.IsNullOrWhiteSpace(model.LotNo))
- {
- str += $" and info.LotNo like '%{model.LotNo}%'";
- }
- // 楠岃瘉绫诲瀷鏄惁涓虹┖
- if (!string.IsNullOrWhiteSpace(model.Type))
- {
- str += $" and info.Type = '{model.Type}'";
- }
- // 楠岃瘉鍘熷洜鏄惁涓虹┖
- if (!string.IsNullOrWhiteSpace(model.Demo))
- {
- str += $" and info.Demo = '{model.Demo}'";
- }
- //楠岃瘉缁撴潫鏃堕棿鏄惁涓虹┖
- if (!string.IsNullOrWhiteSpace(model.StartTime))
- {
- str += $" and info.CreateTime < '{model.StartTime}'";
- }
- //楠岃瘉缁撴潫鏃堕棿鏄惁涓虹┖
- if (!string.IsNullOrWhiteSpace(model.EndTime))
- {
- model.EndTime = (DateTime.Parse(model.EndTime).AddDays(1)).ToString();
- str += $" and info.CreateTime < '{model.EndTime}'";
- }
- #endregion
-
- var list = Db.Ado.SqlQuery<FreezeUnfreezeInfoDto>(str);
- return list;
- }
- catch (Exception ex)
- {
-
- throw ex;
- }
+ return await Db.Queryable<DataFreezeUnfreezeInfo>()
+ .LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
+ .Where(a => a.IsDel == "0" && a.Status == 2)
+ .WhereIF(!string.IsNullOrWhiteSpace(model.SkuNo), a => a.SkuNo.Contains(model.SkuNo))
+ .WhereIF(!string.IsNullOrWhiteSpace(model.SkuName), a => a.SkuName.Contains(model.SkuName))
+ .WhereIF(!string.IsNullOrWhiteSpace(model.LotNo), a => a.LotNo.Contains(model.LotNo))
+ .WhereIF(!string.IsNullOrWhiteSpace(model.Type), a => a.Type == model.Type)
+ .WhereIF(!string.IsNullOrWhiteSpace(model.Demo), a => a.Demo == model.Demo)
+ .WhereIF(!string.IsNullOrWhiteSpace(model.StartTime), a => SqlFunc.GreaterThanOrEqual(a.CreateTime, model.StartTime))
+ .WhereIF(!string.IsNullOrWhiteSpace(model.EndTime), a => SqlFunc.LessThanOrEqual(a.CreateTime, model.EndTime))
+ .Select<FreezeUnfreezeInfoDto>((a, b) => new FreezeUnfreezeInfoDto()
+ {
+ UserName = b.RealName
+ }, true)
+ .ToListAsync();
}
/// <summary>
@@ -164,26 +86,24 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- public string InsertDataFreezeInfo(FreezeUnfreezeInfoDto model)
+ public async Task<string> InsertDataFreezeInfo(FreezeUnfreezeInfoDto model)
{
try
{
string errStr = "";
var TimeStr = Db.GetDate();
//楠岃瘉鎵规涓庣墿鏂欐槸鍚︿负寮傚父
- var stock = Db.Queryable<DataStock>().First(a => a.IsDel == "0" && a.LotNo == model.LotNo && a.SkuNo == model.SkuNo);
+ var stock = await Db.Queryable<DataStock>().FirstAsync(a => a.IsDel == "0" && a.LotNo == model.LotNo && a.SkuNo == model.SkuNo);
//褰撳墠鐗╂枡鎴栨壒娆″瓨鍦ㄥ紓甯�
if (stock == null)
{
- errStr = "-1:褰撳墠鐗╂枡鎴栨壒娆″瓨鍦ㄥ紓甯�!";
- return errStr;
+ throw Oops.Bah("-1:褰撳墠鐗╂枡鎴栨壒娆″瓨鍦ㄥ紓甯�!");
}
//楠岃瘉鐗╂枡淇℃伅鏄惁瀛樺湪寮傚父
var sku = Db.Queryable<SysMaterials>().First(a => a.IsDel == "0" && a.SkuNo == model.SkuNo);
if (sku == null)
{
- errStr = "-1:褰撳墠鐗╂枡淇℃伅瀛樺湪寮傚父!";
- return errStr;
+ throw Oops.Bah("-1:褰撳墠鐗╂枡淇℃伅瀛樺湪寮傚父!");
}
//鍐荤粨
if (model.Status == 1)
@@ -191,22 +111,19 @@
//楠岃瘉鍐荤粨鏁伴噺鏄惁灏忎簬褰撳墠搴撳瓨-閿佸畾-鍐荤粨鏁伴噺
if (model.FrozenQty <= 0)
{
- errStr = "-1:褰撳墠鎯宠鍐荤粨鐨勬暟閲忎笉鍙负0!";
- return errStr;
+ throw Oops.Bah("-1:褰撳墠鎯宠鍐荤粨鐨勬暟閲忎笉鍙负0!");
}
//楠岃瘉鍐荤粨鏁伴噺鏄惁灏忎簬褰撳墠搴撳瓨-閿佸畾-鍐荤粨鏁伴噺
if (model.FrozenQty > (stock.Qty - stock.LockQty - stock.FrozenQty))
{
- errStr = "-1:褰撳墠鎯宠鍐荤粨鐨勬暟閲忓ぇ浜庡簱瀛樺彲鍐荤粨鏁伴噺!";
- return errStr;
+ throw Oops.Bah("-1:褰撳墠鎯宠鍐荤粨鐨勬暟閲忓ぇ浜庡簱瀛樺彲鍐荤粨鏁伴噺!");
}
//楠岃瘉鍘熷洜鏄惁涓虹┖
if (string.IsNullOrWhiteSpace(model.Demo))
{
- errStr = "-1:鍐荤粨鍘熷洜涓嶅彲涓虹┖!";
- return errStr;
+ throw Oops.Bah("-1:鍐荤粨鍘熷洜涓嶅彲涓虹┖!");
}
-
+
}
// 瑙ｅ喕
@@ -215,14 +132,12 @@
//楠岃瘉鍐荤粨鏁伴噺鏄惁灏忎簬褰撳墠搴撳瓨-閿佸畾-鍐荤粨鏁伴噺
if (model.FrozenQty <= 0)
{
- errStr = "-1:褰撳墠鎯宠鍐荤粨鐨勬暟閲忎笉鍙负0!";
- return errStr;
+ throw Oops.Bah("-1:褰撳墠鎯宠鍐荤粨鐨勬暟閲忎笉鍙负0!");
}
//楠岃瘉鍐荤粨鏁伴噺鏄惁灏忎簬褰撳墠搴撳瓨鍐荤粨鏁伴噺
if (model.FrozenQty > model.Qty)
{
- errStr = "-1:褰撳墠鎯宠瑙ｅ喕鐨勬暟閲忓繀椤诲皬浜庡簱瀛樺喕缁撴暟閲�!";
- return errStr;
+ throw Oops.Bah("-1:褰撳墠鎯宠瑙ｅ喕鐨勬暟閲忓繀椤诲皬浜庡簱瀛樺喕缁撴暟閲�!");
}
}
@@ -259,8 +174,8 @@
stock.FrozenQty -= (decimal)model.FrozenQty;
}
- Db.Insertable(list).ExecuteCommand();
- Db.Updateable(stock).ExecuteCommand();
+ await Db.Insertable(list).ExecuteCommandAsync();
+ await Db.Updateable(stock).ExecuteCommandAsync();
Db.CommitTran(); //鎻愪氦
diff --git a/Wms/WMS.BLL/BllCheckServer/WarehouseOutsidePalletsServer.cs b/Wms/WMS.BLL/BllCheckServer/WarehouseOutsidePalletsServer.cs
index 69e2368..9e2a432 100644
--- a/Wms/WMS.BLL/BllCheckServer/WarehouseOutsidePalletsServer.cs
+++ b/Wms/WMS.BLL/BllCheckServer/WarehouseOutsidePalletsServer.cs
@@ -4,6 +4,8 @@
using System;
using System.Collections.Generic;
using System.Text;
+using System.Threading.Tasks;
+using Utility;
using WMS.BLL.LogServer;
using WMS.DAL;
using WMS.Entity.BllAsnEntity;
@@ -18,8 +20,10 @@
public class WarehouseOutsidePalletsServer : DbHelper<DataStockDetail>, IWarehouseOutsidePalletsServer
{
private static readonly SqlSugarScope Db = DataContext.Db;
- public WarehouseOutsidePalletsServer() : base(Db)
+ private readonly UserManager _userManager;
+ public WarehouseOutsidePalletsServer(UserManager userManager) : base(Db)
{
+ _userManager = userManager;
}
/// <summary>
@@ -30,196 +34,158 @@
/// <param name="lotNo">鎵规</param>
/// <param name="palletNo">鎵樼洏鍙�</param>
/// <returns></returns>
- public List<MateDataStockDto> GetPalletsOutside(string skuNo, string skuName, string lotNo, string palletNo, int page, int limit, out int count)
+ public async Task<List<MateDataStockDto>> GetPalletsOutside(string skuNo, string skuName, string lotNo, string palletNo, int page, int limit, RefAsync<int> count)
{
- string sqlCount = "SELECT DISTINCT COUNT(DataStockDetail.ID) " +
- "FROM DataStockDetail " +
- "where IsDel = 0 and isnull(LocatNo,'') = '' and isnull(WareHouseNo,'') = '' ";
-
- string str = "select Id,LotNo,LotText,SupplierLot,SkuNo,SkuName,Standard,Qty,LockQty,FrozenQty,PalletNo," +
- "Status,InspectMark,BitPalletMark,InspectStatus " +
- "from DataStockDetail " +
- "where IsDel = 0 and isnull(LocatNo,'') = '' and isnull(WareHouseNo,'') = ''";
- //鍒ゆ柇鐗╂枡鍙锋槸鍚︿负绌�
- if (!string.IsNullOrEmpty(skuNo))
- {
- str += $" and SkuNo like '%{skuNo}%'";
- }
- //鍒ゆ柇鐗╂枡鍚嶇О鏄惁涓虹┖
- if (!string.IsNullOrEmpty(skuName))
- {
- str += $" and SkuName like '%{skuName}%'";
- }
- //鍒ゆ柇鎵规鏄惁涓虹┖
- if (!string.IsNullOrEmpty(lotNo))
- {
- str += $" and LotNo like '%{lotNo}%'";
- }
- //鍒ゆ柇鎵樼洏鍙锋槸鍚︿负绌�
- if (!string.IsNullOrEmpty(palletNo))
- {
- str += $" and PalletNo like '%{palletNo}%'";
- }
- //鎺掑簭
- str += " order by LotNo,SkuNo,PalletNo";
- if (page == 0)
- {
- page = 1;
- }
- str += $" offset {((page - 1) * limit)} rows fetch next {limit} rows only;";
- List<MateDataStockDto> mateDataStockDtos = Db.Ado.SqlQuery<MateDataStockDto>(str);
- var com = new Common();
- count = com.GetRowCount(sqlCount);
- return mateDataStockDtos;
+ var list = await Db.Queryable<DataStockDetail>()
+ .Where(a => a.IsDel == "0" && SqlFunc.IsNullOrEmpty(a.LocatNo) && SqlFunc.IsNullOrEmpty(a.WareHouseNo))
+ .WhereIF(!string.IsNullOrEmpty(skuNo), a => a.SkuNo.Contains(skuNo))
+ .WhereIF(!string.IsNullOrEmpty(skuName), a => a.SkuName.Contains(skuName))
+ .WhereIF(!string.IsNullOrEmpty(lotNo), a => a.LotNo.Contains(lotNo))
+ .WhereIF(!string.IsNullOrEmpty(palletNo), a => a.PalletNo.Contains(palletNo))
+ .OrderBy(a => new { a.LotNo, a.SkuNo, a.PalletNo })
+ .Select<MateDataStockDto>()
+ .ToPageListAsync(page, limit, count);
+ return list;
}
//淇濆瓨鎸囧畾鐨勫偍浣�
- public void SaveAppointSlot(int stockDetailId, int locateId, int userId)
+ public async Task SaveAppointSlot(int stockDetailId, int locateId)
{
+ //搴撳瓨鏄庣粏淇℃伅
+ var stockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.Id == stockDetailId);
+ if (stockDetail == null)
+ {
+ throw Oops.Bah("鏈煡璇㈠埌搴撳瓨搴撳鎵樼洏鐨勪俊鎭�");
+ }
+ if (!string.IsNullOrWhiteSpace(stockDetail.LocatNo))
+ {
+ throw Oops.Bah("璇ユ墭鐩樺凡鍦ㄥ偍浣嶄笂锛屼笉鑳芥寚瀹氬偍浣嶏紝璇锋牳瀹烇紒");
+ }
+ //鍌ㄤ綅
+ var locate = await Db.Queryable<SysStorageLocat>().FirstAsync(m => m.IsDel == "0" && m.Id == locateId);
+ if (locate == null)
+ {
+ throw Oops.Bah("鏈煡璇㈠埌鍌ㄤ綅鐨勪俊鎭�");
+ }
+ if (locate.Status != "0" || locate.Flag != "0")
+ {
+ throw Oops.Bah("璇ュ偍浣嶇姸鎬佷笉鏄┖鍌ㄤ綅鎴栨爣蹇椾笉鏄甯哥殑");
+ }
+
+ var logTask = await Db.Queryable<LogTask>().FirstAsync(m => m.IsDel == "0" && m.Type == "0" && m.PalletNo == stockDetail.PalletNo && m.Status == "1");
+ if (logTask != null)
+ {
+ throw Oops.Bah("褰撳墠鎵樼洏宸叉湁姝ｅ湪鎵ц鐨勪换鍔★紝璇锋牳瀹炴煡鐪�");
+ }
+
+
+ //鑻ユ槸娣卞害1鐨� 鍒欏垽鏂繁搴�2鏄惁涓虹┖鍌ㄤ綅
+ if (locate.Depth == "01")
+ {
+ var locateDepth = await Db.Queryable<SysStorageLocat>().FirstAsync(a => a.IsDel == "0" && a.Row == locate.Row && a.Column == locate.Column && a.Layer == locate.Layer && a.Depth == "02");
+ if (locateDepth != null)
+ {
+ if (locateDepth.Status != "1")
+ {
+ throw Oops.Bah("璇ュ偍浣嶆繁搴�2涓嶆槸鏈夌墿鍝侊紝涓嶅彲缁戝畾");
+ }
+ }
+ }
+ //鍒ゆ柇鏄惁涓烘繁搴�2鐨� 鑻ヤ负娣卞害2 鍒欒幏鍙栨繁搴�1鍌ㄤ綅 鍒ゆ柇鏄惁涓虹┖鍌ㄤ綅
+ if (locate.Depth == "02")
+ {
+ var locateDepth = await Db.Queryable<SysStorageLocat>().FirstAsync(a => a.IsDel == "0" && a.Row == locate.Row && a.Column == locate.Column && a.Layer == locate.Layer && a.Depth == "01");
+ if (locateDepth.Status != "0" || locateDepth.Flag == "2")
+ {
+ throw Oops.Bah("璇ュ偍浣嶆繁搴�1涓嶆槸绌哄偍浣嶆垨鏍囧織涓嶆槸姝ｅ父鐨�");
+ }
+ }
+
+ // 鑾峰彇姝ゆ墭鐩樼殑浠诲姟鍙�
+ var taskModel = await Db.Queryable<LogTask>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == stockDetail.PalletNo && m.IsSuccess == 0 && m.Status == "0");
+
+ Db.BeginTran();
try
{
-
- //搴撳瓨鏄庣粏淇℃伅
- var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.Id == stockDetailId);
- if (stockDetail == null)
+ var time = DateTime.Now;
+ var taskNo = string.Empty;
+ if (taskModel == null) // 涔嬪墠鏈寚瀹氭墭鐩�
{
- throw new Exception("鏈煡璇㈠埌搴撳瓨搴撳鎵樼洏鐨勪俊鎭�");
- }
- if (!string.IsNullOrWhiteSpace(stockDetail.LocatNo))
- {
- throw new Exception("璇ユ墭鐩樺凡鍦ㄥ偍浣嶄笂锛屼笉鑳芥寚瀹氬偍浣嶏紝璇锋牳瀹烇紒");
- }
- //鍌ㄤ綅
- var locate = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.Id == locateId);
- if (locate == null)
- {
- throw new Exception("鏈煡璇㈠埌鍌ㄤ綅鐨勪俊鎭�");
- }
- if (locate.Status != "0" || locate.Flag != "0")
- {
- throw new Exception("璇ュ偍浣嶇姸鎬佷笉鏄┖鍌ㄤ綅鎴栨爣蹇椾笉鏄甯哥殑");
- }
-
- var logTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.Type == "0" && m.PalletNo == stockDetail.PalletNo && m.Status == "1");
- if (logTask != null)
- {
- throw new Exception("褰撳墠鎵樼洏宸叉湁姝ｅ湪鎵ц鐨勪换鍔★紝璇锋牳瀹炴煡鐪�");
- }
-
-
- //鑻ユ槸娣卞害1鐨� 鍒欏垽鏂繁搴�2鏄惁涓虹┖鍌ㄤ綅
- if (locate.Depth == "01")
- {
- var locateDepth = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.Row == locate.Row && a.Column == locate.Column && a.Layer == locate.Layer && a.Depth == "02");
- if (locateDepth != null)
+ // 娣诲姞鍏ュ簱鏃ュ織璁板綍
+ taskNo = new Common().GetMaxNo("TK");
+ var task = new LogTask //鍏ュ簱浠诲姟
{
- if (locateDepth.Status != "1")
+ TaskNo = taskNo,
+ Sender = "WMS",
+ Receiver = "WCS",
+ IsSuccess = 0, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+ SendDate = time, //鍙戦�佹椂闂�
+ BackDate = time, //杩斿洖鏃堕棿
+ StartRoadway = "", // 璧峰宸烽亾
+ StartLocat = "",//璧峰浣嶇疆
+ EndLocat = locate.LocatNo,//鐩爣浣嶇疆
+ EndRoadway = locate.RoadwayNo, // 鐩爣宸烽亾
+ PalletNo = stockDetail.PalletNo,//鎵樼洏鐮�
+ IsSend = 1,//鏄惁鍙啀娆′笅鍙�
+ IsCancel = 1,//鏄惁鍙彇娑�
+ IsFinish = 1,//鏄惁鍙畬鎴�
+ Type = "0",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
+ Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
+ OrderType = "0",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
+ Msg = "鍏ュ簱鍙ｅ埌=>>" + locate.LocatNo + "鍌ㄤ綅鐨勫叆搴撲换鍔�", //鍏抽敭淇℃伅
+
+ };
+ await Db.Insertable(task).ExecuteCommandAsync();
+
+ locate.Status = "2";
+ await Db.Updateable(locate).ExecuteCommandAsync();
+ }
+ else // 宸叉寚瀹氳繃鎵樼洏闇�鍙樻洿
+ {
+ // 鑾峰彇涓婃鎸囧畾鐨勫偍浣嶅湴鍧�
+ var locateOld = await Db.Queryable<SysStorageLocat>().FirstAsync(m => m.IsDel == "0" && m.LocatNo == taskModel.EndLocat);
+ if (locateOld != null)
+ {
+ if (locateOld.LocatNo == locate.LocatNo) // 鍒ゆ柇褰撳墠鎸囧畾鐨勫湴鍧�鍜屼笂娆＄殑鏄惁涓�鑷达紝鑻ヤ竴鑷翠笉鍋氭洿鏀�
{
- throw new Exception("璇ュ偍浣嶆繁搴�2涓嶆槸鏈夌墿鍝侊紝涓嶅彲缁戝畾");
+ throw new Exception("宸叉寚瀹氱浉鍚屽偍浣嶅湴鍧�");
+ }
+ else // 鑻ヤ笉涓�鑷� 閲婃斁涓婃鎸囧畾鐨勫偍浣嶅湴鍧�
+ {
+ locateOld.Status = "0";
+ await Db.Updateable(locateOld).ExecuteCommandAsync();
}
}
+ locate.Status = "2";
+ await Db.Updateable(locate).ExecuteCommandAsync();
+ // 鏇存柊浠诲姟鍙锋寚瀹氬湴鍧�淇℃伅
+ taskModel.EndLocat = locate.LocatNo;//鐩爣鍌ㄤ綅
+ taskModel.EndRoadway = locate.RoadwayNo;//鐩爣宸烽亾
+ await Db.Updateable(taskModel).ExecuteCommandAsync();
+
+ taskNo = taskModel.TaskNo;
}
- //鍒ゆ柇鏄惁涓烘繁搴�2鐨� 鑻ヤ负娣卞害2 鍒欒幏鍙栨繁搴�1鍌ㄤ綅 鍒ゆ柇鏄惁涓虹┖鍌ㄤ綅
- if (locate.Depth == "02")
+ // 鏇存柊缁勭洏琛ㄥ贩閬撳湴鍧�鍜屽偍浣嶅湴鍧�
+ var bindModel = await Db.Queryable<BllPalletBind>().FirstAsync(m => m.IsDel == "0"
+ && m.PalletNo == stockDetail.PalletNo && m.ASNDetailNo == stockDetail.ASNDetailNo && m.ASNNo == stockDetail.ASNNo);
+ if (string.IsNullOrWhiteSpace(bindModel.TaskNo) || bindModel.TaskNo == taskNo)
{
- var locateDepth = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.Row == locate.Row && a.Column == locate.Column && a.Layer == locate.Layer && a.Depth == "01");
- if (locateDepth.Status != "0" || locateDepth.Flag == "2")
- {
- throw new Exception("璇ュ偍浣嶆繁搴�1涓嶆槸绌哄偍浣嶆垨鏍囧織涓嶆槸姝ｅ父鐨�");
- }
+ bindModel.TaskNo = taskNo;
+ bindModel.WareHouseNo = locate.WareHouseNo;
+ bindModel.RoadwayNo = locate.RoadwayNo;
+ bindModel.LocatNo = locate.LocatNo;
+ await Db.Updateable(bindModel).ExecuteCommandAsync();
}
-
- // 鑾峰彇姝ゆ墭鐩樼殑浠诲姟鍙�
- var taskModel = Db.Queryable<LogTask>().First(m=>m.IsDel=="0" && m.PalletNo == stockDetail.PalletNo && m.IsSuccess ==0 && m.Status =="0");
-
- Db.BeginTran();
- try
- {
- var time = DateTime.Now;
- var taskNo = string.Empty;
- if (taskModel == null) // 涔嬪墠鏈寚瀹氭墭鐩�
- {
- // 娣诲姞鍏ュ簱鏃ュ織璁板綍
- taskNo = new Common().GetMaxNo("TK");
- var task = new LogTask //鍏ュ簱浠诲姟
- {
- TaskNo = taskNo,
- Sender = "WMS",
- Receiver = "WCS",
- IsSuccess = 0, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
- SendDate = time, //鍙戦�佹椂闂�
- BackDate = time, //杩斿洖鏃堕棿
- StartRoadway = "", // 璧峰宸烽亾
- StartLocat = "",//璧峰浣嶇疆
- EndLocat = locate.LocatNo,//鐩爣浣嶇疆
- EndRoadway = locate.RoadwayNo, // 鐩爣宸烽亾
- PalletNo = stockDetail.PalletNo,//鎵樼洏鐮�
- IsSend = 1,//鏄惁鍙啀娆′笅鍙�
- IsCancel = 1,//鏄惁鍙彇娑�
- IsFinish = 1,//鏄惁鍙畬鎴�
- Type = "0",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
- Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
- OrderType = "0",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
- Msg = "鍏ュ簱鍙ｅ埌=>>" + locate.LocatNo + "鍌ㄤ綅鐨勫叆搴撲换鍔�", //鍏抽敭淇℃伅
-
- };
- Db.Insertable(task).ExecuteCommand();
-
- locate.Status = "2";
- Db.Updateable(locate).ExecuteCommand();
- }
- else // 宸叉寚瀹氳繃鎵樼洏闇�鍙樻洿
- {
- // 鑾峰彇涓婃鎸囧畾鐨勫偍浣嶅湴鍧�
- var locateOld = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.LocatNo == taskModel.EndLocat);
- if (locateOld != null)
- {
- if (locateOld.LocatNo == locate.LocatNo) // 鍒ゆ柇褰撳墠鎸囧畾鐨勫湴鍧�鍜屼笂娆＄殑鏄惁涓�鑷达紝鑻ヤ竴鑷翠笉鍋氭洿鏀�
- {
- throw new Exception("宸叉寚瀹氱浉鍚屽偍浣嶅湴鍧�");
- }
- else // 鑻ヤ笉涓�鑷� 閲婃斁涓婃鎸囧畾鐨勫偍浣嶅湴鍧�
- {
- locateOld.Status = "0";
- Db.Updateable(locateOld).ExecuteCommand();
- }
- }
- locate.Status = "2";
- Db.Updateable(locate).ExecuteCommand();
- // 鏇存柊浠诲姟鍙锋寚瀹氬湴鍧�淇℃伅
- taskModel.EndLocat = locate.LocatNo;//鐩爣鍌ㄤ綅
- taskModel.EndRoadway = locate.RoadwayNo;//鐩爣宸烽亾
- Db.Updateable(taskModel).ExecuteCommand();
-
- taskNo = taskModel.TaskNo;
- }
- // 鏇存柊缁勭洏琛ㄥ贩閬撳湴鍧�鍜屽偍浣嶅湴鍧�
- var bindModel = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0"
- && m.PalletNo == stockDetail.PalletNo && m.ASNDetailNo == stockDetail.ASNDetailNo && m.ASNNo == stockDetail.ASNNo);
- if (string.IsNullOrWhiteSpace(bindModel.TaskNo) || bindModel.TaskNo == taskNo)
- {
- bindModel.TaskNo = taskNo;
- bindModel.WareHouseNo = locate.WareHouseNo;
- bindModel.RoadwayNo = locate.RoadwayNo;
- bindModel.LocatNo = locate.LocatNo;
- Db.Updateable(bindModel).ExecuteCommand();
- }
- // 鎻掑叆鎿嶄綔鏃ュ織
- new OperationASNServer().AddLogOperationAsn("搴撳唴浣滀笟", "搴撳鎵樼洏", stockDetail.PalletNo, "缂栬緫",
- $"鎸囧畾浜嗗偍浣嶏細{locate.LocatNo}銆佸崟鎹彿锛歿stockDetail.ASNNo}銆佹墭鐩樼爜锛歿stockDetail.PalletNo}鐨勪俊鎭�", userId);
- //鎻愪氦浜嬪姟
- Db.CommitTran();
- }
- catch (Exception e)
- {
- Db.RollbackTran();
- throw new Exception(e.Message);
- }
-
+ // 鎻掑叆鎿嶄綔鏃ュ織
+ new OperationASNServer().AddLogOperationAsn("搴撳唴浣滀笟", "搴撳鎵樼洏", stockDetail.PalletNo, "缂栬緫",
+ $"鎸囧畾浜嗗偍浣嶏細{locate.LocatNo}銆佸崟鎹彿锛歿stockDetail.ASNNo}銆佹墭鐩樼爜锛歿stockDetail.PalletNo}鐨勪俊鎭�", _userManager.UserId);
+ //鎻愪氦浜嬪姟
+ Db.CommitTran();
}
catch (Exception e)
{
+ Db.RollbackTran();
throw new Exception(e.Message);
}
}
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeDetailServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeDetailServer.cs
index 81b648e..f6f4fe9 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeDetailServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeDetailServer.cs
@@ -3,8 +3,10 @@
using System.Linq;
using System.Linq.Expressions;
using System.Text;
+using System.Threading.Tasks;
using Dm;
using Model.ModelDto.BllSoDto;
+using Model.ModelVm.BllSoVm;
using SqlSugar;
using WMS.BLL.LogServer;
using WMS.DAL;
@@ -22,21 +24,21 @@
public ExportNoticeDetailServer():base(Db)
{
}
- public List<ExportNoticeDetailDto> GetExportNoticeDetailList(string soNo, int page, int limit, out int count)
+ public async Task<List<ExportNoticeDetailDto>> GetExportNoticeDetailList(GetExportNoticeDetailVm model, RefAsync<int> count)
{
try
{
- if (string.IsNullOrWhiteSpace(soNo))
+ if (string.IsNullOrWhiteSpace(model.SoNo))
{
throw new Exception("鍑哄簱鍗曞彿涓虹┖");
}
- var notice = DataContext.Db.Queryable<BllExportNotice>().Where(m => m.IsDel == "0" && m.SONo == soNo).ToList().FirstOrDefault();
+ var notice = DataContext.Db.Queryable<BllExportNotice>().Where(m => m.IsDel == "0" && m.SONo == model.SoNo).ToList().FirstOrDefault();
if (notice == null)
{
throw new Exception("鍑哄簱鍗曞彿涓虹┖");
}
- var total = 0;
- var data = GetAllWhereAsync(a=>a.SONo == soNo)
+
+ var data = await GetAllWhereAsync(a=>a.SONo == model.SoNo)
.LeftJoin<SysPackag>((a,b)=> a.PackagNo == b.PackagNo)
.LeftJoin<SysUserInfor>((a,b,c)=> a.CreateUser == c.Id)
.LeftJoin<SysUserInfor>((a,b,c,d)=> a.UpdateUser == d.Id)
@@ -69,9 +71,8 @@
UpdateUserName = d.RealName,
CreateTime = a.CreateTime,
UpdateTime = a.UpdateTime
- }).ToOffsetPage(page,limit,ref total);
- count = total;
-
+ }).ToPageListAsync(model.Page, model.Limit, count);
+
return data;
}
catch (Exception e)
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 8726081..3f7e3e2 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -812,29 +812,29 @@
#region 鍩虹鍔熻兘
- public List<ExportNoticeDto> GetExportNoticeList(string no, string type, string status, string lotNo, int? logisticsId, string isWave, string isDespatch, string waveNo, int page, int limit, out int count)
+ public async Task<List<ExportNoticeDto>> GetExportNoticeList(GetExportNoticeVm model, RefAsync<int> count)
{
try
{
var strList = new List<string>();
- if (!string.IsNullOrWhiteSpace(lotNo))
+ if (!string.IsNullOrWhiteSpace(model.LotNo))
{
- var detailList = Db.Queryable<BllExportNoticeDetail>().Where(m => m.IsDel == "0" && m.LotNo.Contains(lotNo.Trim())).Select(m => m.SONo).Distinct().ToList();
+ var detailList = Db.Queryable<BllExportNoticeDetail>().Where(m => m.IsDel == "0" && m.LotNo.Contains(model.LotNo.Trim())).Select(m => m.SONo).Distinct().ToList();
strList = detailList;
}
Expression<Func<BllExportNotice, bool>> item = Expressionable.Create<BllExportNotice>()
- .AndIF(!string.IsNullOrWhiteSpace(no), it => it.SONo.Contains(no.Trim()))
- .AndIF(!string.IsNullOrWhiteSpace(type), it => it.Type == type)
- .AndIF(!string.IsNullOrWhiteSpace(status), it => it.Status == status)
- .AndIF(logisticsId != null, it => it.LogisticsId == logisticsId)
- .AndIF(!string.IsNullOrWhiteSpace(isWave), it => it.IsWave == isWave)
- .AndIF(!string.IsNullOrWhiteSpace(isDespatch), it => it.IsDespatch == isDespatch)
- .AndIF(!string.IsNullOrWhiteSpace(waveNo), it => it.WaveNo.Contains(waveNo.Trim()))
- .AndIF(!string.IsNullOrWhiteSpace(lotNo), it => strList.Contains(it.SONo))
+ .AndIF(!string.IsNullOrWhiteSpace(model.No), it => it.SONo.Contains(model.No.Trim()))
+ .AndIF(!string.IsNullOrWhiteSpace(model.Type), it => it.Type == model.Type)
+ .AndIF(!string.IsNullOrWhiteSpace(model.Status), it => it.Status == model.Status)
+ .AndIF(model.LogisticsId != null, it => it.LogisticsId == model.LogisticsId)
+ .AndIF(!string.IsNullOrWhiteSpace(model.IsWave), it => it.IsWave == model.IsWave)
+ .AndIF(!string.IsNullOrWhiteSpace(model.IsDespatch), it => it.IsDespatch == model.IsDespatch)
+ .AndIF(!string.IsNullOrWhiteSpace(model.WaveNo), it => it.WaveNo.Contains(model.WaveNo.Trim()))
+ .AndIF(!string.IsNullOrWhiteSpace(model.LotNo), it => strList.Contains(it.SONo))
.ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
- var total = 0;
- var data = GetAllWhereAsync(item)
+
+ var data = await GetAllWhereAsync(item)
.LeftJoin<SysLogisticsInfo>((a, b) => a.LogisticsId == b.Id)
.LeftJoin<SysUserInfor>((a, b, c) => a.CreateUser == c.Id)
.LeftJoin<SysUserInfor>((a, b, c, d) => a.CreateUser == d.Id)
@@ -867,8 +867,7 @@
CheckTime = a.CheckTime
})
.OrderByDescending(a => a.CreateTime)
- .ToOffsetPage(page, limit, ref total);
- count = total;
+ .ToPageListAsync(model.Page, model.Limit, count);
return data;
}
diff --git a/Wms/WMS.BLL/LogServer/OperationCrServer.cs b/Wms/WMS.BLL/LogServer/OperationCrServer.cs
index 253df18..45580a1 100644
--- a/Wms/WMS.BLL/LogServer/OperationCrServer.cs
+++ b/Wms/WMS.BLL/LogServer/OperationCrServer.cs
@@ -27,7 +27,7 @@
{
_userManager = userManager;
}
- public List<OperationDto> GetLogOperationCrList(string menuName, string type, string msg, string startTime, string endTime, int page, int limit, out int count)
+ public async Task<List<OperationDto>> GetLogOperationCrList(string menuName, string type, string msg, string startTime, string endTime, int page, int limit, RefAsync<int> count)
{
try
{
@@ -38,8 +38,7 @@
.AndIF(!string.IsNullOrWhiteSpace(startTime), it => it.CreateTime >= Convert.ToDateTime(startTime))
.AndIF(!string.IsNullOrWhiteSpace(endTime), it => it.CreateTime <= Convert.ToDateTime(endTime).AddDays(1))
.ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
- var total = 0;
- var list = GetAllWhereAsync(item)
+ var list = await GetAllWhereAsync(item)
.LeftJoin<SysDictionary>((it, dic) => it.Type == dic.Id.ToString())
.LeftJoin<SysUserInfor>((it, dic, users) => it.CreateUser == users.Id)
.Select((it, dic, users) => new OperationDto()
@@ -55,10 +54,8 @@
CreateUserName = users.RealName,
})
.OrderByDescending(it => it.CreateTime)
- .ToOffsetPage(page, limit, ref total);
-
- count = total;
- return list.OrderByDescending(m => m.CreateTime).ToList();
+ .ToPageListAsync(page, limit, count);
+ return list;
}
catch (Exception e)
{
@@ -104,7 +101,7 @@
input.Type = (await Db.Queryable<SysDictionary>().FirstAsync(s => s.DictName == input.TypeName && s.IsDel == "0"))?.Id.ToString();
input.CreateUser = _userManager.UserId;
input.CreateTime = DateTime.Now;
- return await Db.Insertable<LogOperationSys>(input).ExecuteCommandAsync();
+ return await Db.Insertable<LogOperationCR>(input).ExecuteCommandAsync();
}
}
}
diff --git a/Wms/WMS.BLL/LogServer/TaskServer.cs b/Wms/WMS.BLL/LogServer/TaskServer.cs
index 7a5748a..582b27e 100644
--- a/Wms/WMS.BLL/LogServer/TaskServer.cs
+++ b/Wms/WMS.BLL/LogServer/TaskServer.cs
@@ -3,6 +3,7 @@
using System.Linq;
using System.Linq.Expressions;
using System.Text;
+using System.Threading.Tasks;
using Model.ModelDto.BllSoDto;
using Model.ModelDto.LogDto;
using SqlSugar;
@@ -22,7 +23,7 @@
}
- public List<TaskDto> GetTaskList(List<string> orderType, string type, string status, string taskNo, int isSuccess, string palletNo, string msg, int page, int limit, out int count)
+ public async Task<List<TaskDto>> GetTaskList(List<string> orderType, string type, string status, string taskNo, int isSuccess, string palletNo, string msg, int page, int limit, RefAsync<int> count)
{
try
{
@@ -35,8 +36,7 @@
.AndIF(!string.IsNullOrWhiteSpace(palletNo), it => it.PalletNo.Contains(palletNo.Trim()))
.AndIF(!string.IsNullOrWhiteSpace(msg), it => it.Msg.Contains(msg.Trim()))
.ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
- var total = 0;
- var data = GetAllWhereAsync(item)
+ var data = await GetAllWhereAsync(item)
.LeftJoin<SysUserInfor>((a,b)=>a.CreateUser == b.Id).
Select((a,b) => new TaskDto()
{
@@ -67,10 +67,9 @@
CreateTime = a.CreateTime
})
.OrderByDescending(a => a.TaskNo)
- .ToOffsetPage(page,limit,ref total);
- count = total;
+ .ToPageListAsync(page,limit, count);
- return data.OrderByDescending(m=>m.TaskNo).ToList();
+ return data;
}
catch (Exception e)
{
diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index f3ffb62..a6ea852 100644
--- a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
@@ -120,11 +120,11 @@
}
- public bool EditStorageLocat(EditLocateVm model,string url ,int userId)
+ public bool EditStorageLocat(EditLocateVm model, string url, int userId)
{
try
{
- var bl = LocatRst.EditStorageLocat(model.Id, model.Status, model.Flag, model.Temperature,url, userId);
+ var bl = LocatRst.EditStorageLocat(model.Id, model.Status, model.Flag, model.Temperature, url, userId);
return bl;
}
@@ -137,6 +137,7 @@
/// <summary>
/// 娣诲姞鍌ㄤ綅淇℃伅锛堢珛浣撳簱锛夌敤浜庡紑鍙戜汉鍛樻坊鍔犲熀纭�淇℃伅
/// </summary>
+ /// <param name="index">褰撳墠鎺掓暟</param>
/// <param name="houseNo">浠撳簱鍙�</param>
/// <param name="roadwayNo">宸烽亾鍙�</param>
/// <param name="areaNo">鍖哄煙鍙�</param>
@@ -146,14 +147,14 @@
/// <param name="dept">娣卞害</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- public async Task<int> AddStorageLocat(string houseNo, string roadwayNo, string areaNo, int row, int col, int layer, string dept, int userId)
+ public async Task<int> AddStorageLocat(int index, string houseNo, string roadwayNo, string areaNo, int row, int col, int layer, string dept, int userId)
{
try
{
var q = 0;
//R01 -01 -01 -02
//宸烽亾鈥撴帓-鍒�-灞�
- for (int r = 12; r <= row; r++)//鎺�
+ for (int r = index; r <= row; r++)//鎺�
{
var r1 = "1";
if (r < 10)
@@ -267,7 +268,7 @@
}
}
- public bool EditStorageLocatList(EditLocateListVm model,string url, int userId)
+ public bool EditStorageLocatList(EditLocateListVm model, string url, int userId)
{
try
{
diff --git a/Wms/WMS.IBLL/IBllCheckServer/IStockCheckLogServer.cs b/Wms/WMS.IBLL/IBllCheckServer/IStockCheckLogServer.cs
index 6888f76..6ad57c4 100644
--- a/Wms/WMS.IBLL/IBllCheckServer/IStockCheckLogServer.cs
+++ b/Wms/WMS.IBLL/IBllCheckServer/IStockCheckLogServer.cs
@@ -1,7 +1,9 @@
锘縰sing System;
using System.Collections.Generic;
using System.Text;
+using System.Threading.Tasks;
using Model.ModelDto.BllCheckDto;
+using SqlSugar;
namespace WMS.IBLL.IBllCheckServer
{
@@ -21,14 +23,14 @@
/// <param name="limit"></param>
/// <param name="count"></param>
/// <returns></returns>
- List<StockCheckLogDto> GetStockCheckLogList(string crNo, string status, string palletNo, string boxNo, string skuNo, string skuName,
- string lotNo, int page, int limit, out int count);
+ Task<List<StockCheckLogDto>> GetStockCheckLogList(string crNo, string status, string palletNo, string boxNo, string skuNo, string skuName,
+ string lotNo, int page, int limit, RefAsync<int> count);
/// <summary>
/// 鑾峰彇鐩樼偣璁板綍-鏁版嵁褰掓。
/// </summary>
/// <returns></returns>
- public List<StockCheckLogDto> GetArchivingStockCheckLogList(string crNo, string status, string palletNo, string boxNo, string skuNo, string skuName,
+ List<StockCheckLogDto> GetArchivingStockCheckLogList(string crNo, string status, string palletNo, string boxNo, string skuNo, string skuName,
string lotNo, int page, int limit, out int count);
}
}
diff --git a/Wms/WMS.IBLL/IBllCheckServer/IStockFreectSetve.cs b/Wms/WMS.IBLL/IBllCheckServer/IStockFreectSetve.cs
index f79599f..b4c9a10 100644
--- a/Wms/WMS.IBLL/IBllCheckServer/IStockFreectSetve.cs
+++ b/Wms/WMS.IBLL/IBllCheckServer/IStockFreectSetve.cs
@@ -2,6 +2,7 @@
using System;
using System.Collections.Generic;
using System.Text;
+using System.Threading.Tasks;
using WMS.Entity.DataEntity;
using WMS.Entity.SysEntity;
@@ -17,28 +18,28 @@
/// <param name="SkuNo">鐗╂枡缂栫爜</param>
/// <param name="type">0锛氳幏鍙栧彲鍐荤粨搴撳瓨 1锛氳幏鍙栧彲瑙ｅ喕鏁版嵁</param>
/// <returns></returns>
- List<DataStock> ByTypeGetDataStockType(string SkuNo,int type);
+ Task<List<DataStock>> ByTypeGetDataStockType(string SkuNo,int type);
/// <summary>
/// 鑾峰彇搴撳瓨鍐荤粨淇℃伅
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- List<FreezeUnfreezeInfoDto> GetDataFreezeList(FreezeUnfreezeInfoDto model);
+ Task<List<FreezeUnfreezeInfoDto>> GetDataFreezeList(FreezeUnfreezeInfoDto model);
/// <summary>
/// 鑾峰彇搴撳瓨瑙ｅ喕淇℃伅
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- List<FreezeUnfreezeInfoDto> GetDataUnFreezeList(FreezeUnfreezeInfoDto model);
+ Task<List<FreezeUnfreezeInfoDto>> GetDataUnFreezeList(FreezeUnfreezeInfoDto model);
/// <summary>
/// 娣诲姞鍐荤粨\瑙ｅ喕淇℃伅
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- string InsertDataFreezeInfo(FreezeUnfreezeInfoDto model);
+ Task<string> InsertDataFreezeInfo(FreezeUnfreezeInfoDto model);
#endregion
}
diff --git a/Wms/WMS.IBLL/IBllCheckServer/IWarehouseOutsidePalletsServer.cs b/Wms/WMS.IBLL/IBllCheckServer/IWarehouseOutsidePalletsServer.cs
index 5afb498..f1310f8 100644
--- a/Wms/WMS.IBLL/IBllCheckServer/IWarehouseOutsidePalletsServer.cs
+++ b/Wms/WMS.IBLL/IBllCheckServer/IWarehouseOutsidePalletsServer.cs
@@ -1,7 +1,9 @@
锘縰sing Model.ModelDto.DataDto;
+using SqlSugar;
using System;
using System.Collections.Generic;
using System.Text;
+using System.Threading.Tasks;
namespace WMS.IBLL.IBllCheckServer
{
@@ -15,7 +17,7 @@
/// <param name="lotNo">鎵规</param>
/// <param name="palletNo">鎵樼洏鍙�</param>
/// <returns></returns>
- List<MateDataStockDto> GetPalletsOutside(string skuNo, string skuName, string lotNo, string palletNo, int page, int limit, out int count);
+ Task<List<MateDataStockDto>> GetPalletsOutside(string skuNo, string skuName, string lotNo, string palletNo, int page, int limit, RefAsync<int> count);
/// <summary>
/// 搴撳鎵樼洏鎸囧畾鍌ㄤ綅淇℃伅
@@ -23,7 +25,7 @@
/// <param name="stockDetailId">搴撳瓨鏄庣粏ID</param>
/// <param name="locateId">鍌ㄤ綅淇℃伅ID</param>
/// <param name="userId">鎿嶄綔浜�</param>
- void SaveAppointSlot(int stockDetailId, int locateId, int userId);
+ Task SaveAppointSlot(int stockDetailId, int locateId);
}
}
diff --git a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeDetailServer.cs b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeDetailServer.cs
index 7ddd530..bf985ad 100644
--- a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeDetailServer.cs
+++ b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeDetailServer.cs
@@ -1,7 +1,10 @@
锘縰sing System;
using System.Collections.Generic;
using System.Text;
+using System.Threading.Tasks;
using Model.ModelDto.BllSoDto;
+using Model.ModelVm.BllSoVm;
+using SqlSugar;
namespace WMS.IBLL.IBllSoServer
{
@@ -15,7 +18,7 @@
/// <param name="limit"></param>
/// <param name="count"></param>
/// <returns></returns>
- List<ExportNoticeDetailDto> GetExportNoticeDetailList(string soNo, int page, int limit, out int count);
+ Task<List<ExportNoticeDetailDto>> GetExportNoticeDetailList(GetExportNoticeDetailVm model, RefAsync<int> count);
/// <summary>
/// 鍒犻櫎鍑哄簱鍗曟槑缁�
diff --git a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
index c679920..870ddad 100644
--- a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
+++ b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
@@ -5,6 +5,8 @@
using WMS.Entity.DataEntity;
using System.Collections.Generic;
using System.Xml;
+using System.Threading.Tasks;
+using SqlSugar;
namespace WMS.IBLL.IBllSoServer
{
@@ -47,7 +49,7 @@
/// <param name="limit"></param>
/// <param name="count"></param>
/// <returns></returns>
- List<ExportNoticeDto> GetExportNoticeList(string no,string type, string status, string LotNo,int? logisticsId,string isWave, string isDespatch,string waveNo, int page, int limit, out int count);
+ Task<List<ExportNoticeDto>> GetExportNoticeList(GetExportNoticeVm model, RefAsync<int> count);
/// <summary>
/// 鑾峰彇娣诲姞鎴栦慨鏀瑰嚭搴撳崟鏄庣粏鎵�鏄剧ず鐨勫簱瀛樻暟鎹簮
diff --git a/Wms/WMS.IBLL/ILogServer/IOperationCRServer.cs b/Wms/WMS.IBLL/ILogServer/IOperationCRServer.cs
index eb4074c..ee046fa 100644
--- a/Wms/WMS.IBLL/ILogServer/IOperationCRServer.cs
+++ b/Wms/WMS.IBLL/ILogServer/IOperationCRServer.cs
@@ -4,6 +4,7 @@
using System.Threading.Tasks;
using Model.ModelDto.LogDto;
using Model.ModelVm.LogVm;
+using SqlSugar;
namespace WMS.IBLL.ILogServer
{
@@ -21,8 +22,8 @@
/// <param name="limit"></param>
/// <param name="count"></param>
/// <returns></returns>
- List<OperationDto> GetLogOperationCrList(string menuName, string type, string msg, string startTime,
- string endTime, int page, int limit, out int count);
+ Task<List<OperationDto>> GetLogOperationCrList(string menuName, string type, string msg, string startTime,
+ string endTime, int page, int limit, RefAsync<int> count);
/// <summary>
/// 娣诲姞搴撳唴(鐩樺簱銆佺Щ搴�)鎿嶄綔鏃ュ織
/// </summary>
diff --git a/Wms/WMS.IBLL/ILogServer/ITaskServer.cs b/Wms/WMS.IBLL/ILogServer/ITaskServer.cs
index ff31676..bd45874 100644
--- a/Wms/WMS.IBLL/ILogServer/ITaskServer.cs
+++ b/Wms/WMS.IBLL/ILogServer/ITaskServer.cs
@@ -1,7 +1,9 @@
锘縰sing System;
using System.Collections.Generic;
using System.Text;
+using System.Threading.Tasks;
using Model.ModelDto.LogDto;
+using SqlSugar;
using WMS.Entity.LogEntity;
namespace WMS.IBLL.ILogServer
@@ -22,7 +24,7 @@
/// <param name="limit"></param>
/// <param name="count"></param>
/// <returns></returns>
- List<TaskDto> GetTaskList(List<string> orderType, string type, string status, string taskNo, int isSuccess, string palletNo,string msg, int page, int limit, out int count);
+ Task<List<TaskDto>> GetTaskList(List<string> orderType, string type, string status, string taskNo, int isSuccess, string palletNo,string msg, int page, int limit, RefAsync<int> count);
/// <summary>
/// 淇敼浠诲姟涓嬪彂鎴愬姛
diff --git a/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs b/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs
index 2014c78..3d2bde2 100644
--- a/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs
+++ b/Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs
@@ -40,12 +40,13 @@
/// <param name="model"></param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- bool EditStorageLocat(EditLocateVm model, string url,int userId);
+ bool EditStorageLocat(EditLocateVm model, string url, int userId);
/// <summary>
/// 娣诲姞鍌ㄤ綅淇℃伅锛堢珛浣撳簱锛夌敤浜庡紑鍙戜汉鍛樻坊鍔犲熀纭�淇℃伅
/// </summary>
/// <param name="locateNo">鍌ㄤ綅鍙�</param>
+ /// <param name="index">褰撳墠鎺�</param>
/// <param name="houseNo">浠撳簱鍙�</param>
/// <param name="roadwayNo">宸烽亾鍙�</param>
/// <param name="areaNo">鍖哄煙鍙�</param>
@@ -55,7 +56,7 @@
/// <param name="dept">娣卞害</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- Task<int> AddStorageLocat(string houseNo, string roadwayNo, string areaNo, int row, int col, int layer, string dept, int userId);
+ Task<int> AddStorageLocat(int index, string houseNo, string roadwayNo, string areaNo, int row, int col, int layer, string dept, int userId);
/// <summary>
/// 娣诲姞鍌ㄤ綅淇℃伅锛堝钩搴擄級鐢ㄤ簬寮�鍙戜汉鍛樻坊鍔犲熀纭�淇℃伅
@@ -77,7 +78,7 @@
/// <param name="model"></param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- bool EditStorageLocatList(EditLocateListVm model,string url, int userId);
+ bool EditStorageLocatList(EditLocateListVm model, string url, int userId);
/// <summary>
/// 鑾峰彇鍌ㄤ綅淇℃伅
diff --git a/Wms/Wms/Controllers/BllAsnController.cs b/Wms/Wms/Controllers/BllAsnController.cs
index 964115f..c747d12 100644
--- a/Wms/Wms/Controllers/BllAsnController.cs
+++ b/Wms/Wms/Controllers/BllAsnController.cs
@@ -680,12 +680,13 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetArrivalTaskList(GetTaskVm model)
+ public async Task<IActionResult> GetArrivalTaskList(GetTaskVm model)
{
try
{
var type = new List<string>() { "0" };
- var bolls = _taskSvc.GetTaskList(type, model.Type, model.Status, model.TaskNo, model.IsSuccess, model.PalletNo, model.Msg, model.Page, model.Limit, out int count);
+ RefAsync<int> count = new RefAsync<int>();
+ var bolls = await _taskSvc.GetTaskList(type, model.Type, model.Status, model.TaskNo, model.IsSuccess, model.PalletNo, model.Msg, model.Page, model.Limit, count);
return Ok(new { code = 0, count, msg = "鍏ュ簱浠诲姟淇℃伅", data = bolls });
}
diff --git a/Wms/Wms/Controllers/BllCheckController.cs b/Wms/Wms/Controllers/BllCheckController.cs
index 79bbb0b..812b777 100644
--- a/Wms/Wms/Controllers/BllCheckController.cs
+++ b/Wms/Wms/Controllers/BllCheckController.cs
@@ -168,11 +168,12 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetStockCheckLogList(GetCheckLogVm model)
+ public async Task<IActionResult> GetStockCheckLogList(GetCheckLogVm model)
{
try
{
- var list = _stockCheckLogSvc.GetStockCheckLogList(model.CrNo, model.Status, model.PalletNo, model.BoxNo, model.SkuNo, model.SkuName, model.LotNo, model.Page, model.Limit, out int count);
+ RefAsync<int> count = new RefAsync<int>();
+ var list = await _stockCheckLogSvc.GetStockCheckLogList(model.CrNo, model.Status, model.PalletNo, model.BoxNo, model.SkuNo, model.SkuName, model.LotNo, model.Page, model.Limit, count);
return Ok(new { code = 0, count, msg = "鐩樼偣璁板綍", data = list });
}
@@ -192,12 +193,13 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetCrTaskList(GetTaskVm model)
+ public async Task<IActionResult> GetCrTaskList(GetTaskVm model)
{
try
{
var type = new List<string>() { "2", "3", "4" };
- var bolls = _taskSvc.GetTaskList(type, model.Type, model.Status, model.TaskNo, model.IsSuccess, model.PalletNo, model.Msg, model.Page, model.Limit, out int count);
+ RefAsync<int> count = new RefAsync<int>();
+ var bolls = await _taskSvc.GetTaskList(type, model.Type, model.Status, model.TaskNo, model.IsSuccess, model.PalletNo, model.Msg, model.Page, model.Limit, count);
return Ok(new { code = 0, count, msg = "搴撳唴浠诲姟淇℃伅", data = bolls });
}
@@ -213,11 +215,12 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetLogOperationCrList(GetOperationVm model)
+ public async Task<IActionResult> GetLogOperationCrList(GetOperationVm model)
{
try
{
- var bolls = _logSvc.GetLogOperationCrList(model.MenuName, model.Type, model.Msg, model.StartTime, model.EndTime, model.Page, model.Limit, out int count);
+ RefAsync<int> count = new RefAsync<int>();
+ var bolls = await _logSvc.GetLogOperationCrList(model.MenuName, model.Type, model.Msg, model.StartTime, model.EndTime, model.Page, model.Limit, count);
return Ok(new { code = 0, count, msg = "鍑哄簱鎿嶄綔鏃ュ織淇℃伅", data = bolls });
}
@@ -329,9 +332,10 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetPalletsOutside(PalletsOutVm model)
+ public async Task<IActionResult> GetPalletsOutside(PalletsOutVm model)
{
- List<MateDataStockDto> mateDataStockDtos = _stockPallet.GetPalletsOutside(model.SkuNo, model.SkuName, model.LotNo, model.PalletNo, model.Page, model.Limit, out int count);
+ RefAsync<int> count = new RefAsync<int>();
+ List<MateDataStockDto> mateDataStockDtos = await _stockPallet.GetPalletsOutside(model.SkuNo, model.SkuName, model.LotNo, model.PalletNo, model.Page, model.Limit, count);
return Ok(new { code = 0, count, msg = "鑾峰彇搴撳鎵樼洏淇℃伅鎴愬姛", data = mateDataStockDtos });
}
@@ -341,7 +345,7 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult SaveAppointSlot(SaveAppointSlotVm model)
+ public async Task<IActionResult> SaveAppointSlot(SaveAppointSlotVm model)
{
try
{
@@ -356,7 +360,7 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- _stockPallet.SaveAppointSlot(model.StockDetailId, model.LocateId, int.Parse(userId));
+ await _stockPallet.SaveAppointSlot(model.StockDetailId, model.LocateId);
return Ok(new { code = 0, count = 0, msg = "鎸囧畾鍌ㄤ綅鎴愬姛", data = "" });
}
@@ -430,11 +434,11 @@
/// <param name="type">0锛氳幏鍙栧彲鍐荤粨搴撳瓨 1锛氳幏鍙栧彲瑙ｅ喕鏁版嵁</param>
/// <returns></returns>
[HttpGet]
- public IActionResult ByTypeGetDataStockType(string SkuNo, int type)
+ public async Task<IActionResult> ByTypeGetDataStockType(string SkuNo, int type)
{
try
{
- var models = _freect.ByTypeGetDataStockType(SkuNo, type);
+ var models = await _freect.ByTypeGetDataStockType(SkuNo, type);
return Ok(new
{
@@ -459,11 +463,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetDataFreezeList(FreezeUnfreezeInfoDto model)
+ public async Task<IActionResult> GetDataFreezeList(FreezeUnfreezeInfoDto model)
{
try
{
- var models = _freect.GetDataFreezeList(model);
+ var models = await _freect.GetDataFreezeList(model);
return Ok(new
{
@@ -488,11 +492,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetDataUnFreezeList(FreezeUnfreezeInfoDto model)
+ public async Task<IActionResult> GetDataUnFreezeList(FreezeUnfreezeInfoDto model)
{
try
{
- var models = _freect.GetDataUnFreezeList(model);
+ var models = await _freect.GetDataUnFreezeList(model);
return Ok(new
{
@@ -517,7 +521,7 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult InsertDataFreezeInfo(FreezeUnfreezeInfoDto model)
+ public async Task<IActionResult> InsertDataFreezeInfo(FreezeUnfreezeInfoDto model)
{
try
{
@@ -533,7 +537,7 @@
}
model.CreateUser = int.Parse(UserId);
- string strMesage = _freect.InsertDataFreezeInfo(model);
+ string strMesage = await _freect.InsertDataFreezeInfo(model);
//var arr = strMesage.Split(':');
if (!strMesage.Contains("-1"))
{
diff --git a/Wms/Wms/Controllers/BllSoController.cs b/Wms/Wms/Controllers/BllSoController.cs
index 6e9040d..f81022e 100644
--- a/Wms/Wms/Controllers/BllSoController.cs
+++ b/Wms/Wms/Controllers/BllSoController.cs
@@ -13,6 +13,10 @@
using Newtonsoft.Json;
using Utility.Tools;
using Model.InterFaceModel;
+using SqlSugar;
+using Utility;
+using System.Threading.Tasks;
+using Model.ModelDto.BllSoDto;
namespace Wms.Controllers
{
@@ -53,18 +57,13 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetExportNoticeList(GetExportNoticeVm model)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<SqlSugarPagedList> GetExportNoticeList(GetExportNoticeVm model)
{
- try
- {
- var bolls = _exNoticeSvc.GetExportNoticeList(model.No, model.Type, model.Status,model.LotNo,model.LogisticsId,model.IsWave,model.IsDespatch,model.WaveNo, model.Page, model.Limit, out int count);
+ RefAsync<int> count = new RefAsync<int>();
+ var bolls = await _exNoticeSvc.GetExportNoticeList(model, count);
- return Ok(new { code = 0, count, msg = "鍑哄簱鍗曚俊鎭�", data = bolls });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ return new SqlSugarPagedList() { Items = bolls, Total = count };
}
/// <summary>
@@ -280,18 +279,13 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetExportNoticeDetailList(GetExportNoticeDetailVm model)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<SqlSugarPagedList> GetExportNoticeDetailList(GetExportNoticeDetailVm model)
{
- try
- {
- var bolls = _exNoticeDetailSvc.GetExportNoticeDetailList(model.SoNo, model.Page, model.Limit, out int count);
+ RefAsync<int> count = new RefAsync<int>();
+ var bolls = await _exNoticeDetailSvc.GetExportNoticeDetailList(model, count);
- return Ok(new { code = 0, count, msg = "鍑哄簱鍗曟槑缁嗕俊鎭�", data = bolls });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ return new SqlSugarPagedList() { Items = bolls, Total = count };
}
/// <summary>
@@ -720,12 +714,13 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetExportTaskList(GetTaskVm model)
+ public async Task<IActionResult> GetExportTaskList(GetTaskVm model)
{
try
{
var type = new List<string>(){"1","4"};
- var bolls = _taskSvc.GetTaskList( type, model.Type,model.Status,model.TaskNo,model.IsSuccess,model.PalletNo,model.Msg,model.Page, model.Limit, out int count);
+ RefAsync<int> count = new RefAsync<int>();
+ var bolls = await _taskSvc.GetTaskList( type, model.Type,model.Status,model.TaskNo,model.IsSuccess,model.PalletNo,model.Msg,model.Page, model.Limit, count);
return Ok(new { code = 0, count, msg = "鍑哄簱浠诲姟淇℃伅", data = bolls });
}
diff --git a/Wms/Wms/Controllers/SysController.cs b/Wms/Wms/Controllers/SysController.cs
index d45cf4a..d177afc 100644
--- a/Wms/Wms/Controllers/SysController.cs
+++ b/Wms/Wms/Controllers/SysController.cs
@@ -955,7 +955,7 @@
{
return Ok(new { code = 1, msg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- var bolls = _roadwaySvc.EditStorageRoadway(model.Id, model.RoadwayName, model.Priority, model.Type, model.Temp,model.Availa, int.Parse(userId));
+ var bolls = _roadwaySvc.EditStorageRoadway(model.Id, model.RoadwayName, model.Priority, model.Type, model.Temp, model.Availa, int.Parse(userId));
if (bolls)
{
SysStorageRoadway storage = _roadwaySvc.GetStorageRoadway(model.Id);
@@ -1091,7 +1091,7 @@
//{
// return Ok(new { code = 400, ErrorMsg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
//}
- var bolls = await _locatSvc.AddStorageLocat(model.HouseNo, model.RoadwayNo, model.AreaNo, model.Row, model.Col, model.Layer, model.Depth, 1);
+ var bolls = await _locatSvc.AddStorageLocat(model.Index, model.HouseNo, model.RoadwayNo, model.AreaNo, model.Row, model.Col, model.Layer, model.Depth, 1);
if (bolls > 0)
{
await _operation.InsertOperation("浠撳簱璁剧疆", "鍌ㄤ綅绠＄悊", model.RoadwayNo, "娣诲姞", "娣诲姞鍌ㄤ綅淇℃伅 鍌ㄤ綅鍙凤細" + model.RoadwayNo, 1);
@@ -1184,7 +1184,7 @@
{
return Ok(new { code = 1, msg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- var bolls = _locatSvc.EditStorageLocat(model, _config.WcsHost + _config.EditLocateUrl,int.Parse(userId));
+ var bolls = _locatSvc.EditStorageLocat(model, _config.WcsHost + _config.EditLocateUrl, int.Parse(userId));
if (bolls)
{
SysStorageLocat storage = _locatSvc.GetStorageLocat(model.Id);
@@ -2048,7 +2048,7 @@
/// <returns></returns>
[HttpGet]
public IActionResult GetAvailabilityRoadry()
- {
+ {
try
{
var list = _locatSvc.GetAvailabilityRoadry();
@@ -2164,11 +2164,11 @@
#region 鏁版嵁褰掓。
[HttpGet]
- public IActionResult GetArchivingLogList(int Page=1, int Limit=10)
+ public IActionResult GetArchivingLogList(int Page = 1, int Limit = 10)
{
try
{
- var list = _archiving.GetArchivingLogList(Page,Limit, out int count);
+ var list = _archiving.GetArchivingLogList(Page, Limit, out int count);
return Ok(new
{
data = list,
@@ -2210,7 +2210,7 @@
{
return Ok(new { data = "", code = 1, msg = $"鎿嶄綔澶辫触锛歿e.Message}" });
}
-
+
}
#endregion
--
Gitblit v1.8.0