From e34f379c22862982c20376c952ab56f9c4ccb163 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期二, 25 六月 2024 08:08:04 +0800
Subject: [PATCH] 修改controller
---
Wms/Wms/Controllers/UpApiController.cs | 9
Wms/WMS.BLL/BllTransServer/NoticeServer.cs | 8
Wms/Model/InterFaceModel/TaskModel.cs | 19 ++
Wms/WMS.BLL/DataServer/StockDetailServer.cs | 82 ++++++++++
Wms/Model/ModelDto/DataDto/StockDetailDto.cs | 10
Wms/WMS.IBLL/IBllTransServer/INoticeServer.cs | 8
Wms/Wms/Controllers/StatisticalController.cs | 34 ++++
HTML/views/ASNSetting/ArrivalNotice.html | 18 +-
HTML/views/StatisticalReport/BoxInfor.html | 98 ++++++++++-
Wms/Model/InterFaceModel/AsnModels.cs | 5
HTML/views/StatisticalReport/PalletAddFrom.html | 157 +++++++++++++++++++
Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs | 5
12 files changed, 415 insertions(+), 38 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 9013e63..8922c66 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -546,18 +546,18 @@
{field: 'CompleteTime',title: '瀹屾垚鏃堕棿',align: 'center', width: 160,templet: '#templetCompleteTime2'},
{field: 'IsSampling',title: '鏄惁鍙栨牱',align: 'center',width: 90,templet: '#templetIsSampling'},
{field: 'InspectStatus',title: '璐ㄦ鐘舵��',align: 'center',width: 90,templet: '#templetInspectStatus'},
- {field: 'UnitName',title: '璁￠噺鍗曚綅',align: 'center',width: 90},
+ //{field: 'UnitName',title: '璁￠噺鍗曚綅',align: 'center',width: 90},
// {field: 'Price',title: '鍗曚环',align: 'center',width: 65},
// {field: 'Money',title: '閲戦',align: 'center',width: 65},
{field: 'LotText',title: '鎵规鎻忚堪',align: 'center',width: 120},
- {field: 'PackagName',title: '鍖呰鍚嶇О',align: 'center',width: 110,},
- {field: 'IsBale',title: '鏄惁瑁瑰寘',align: 'center',width: 150},
- {field: 'IsBelt',title: '鏄惁鎵撳甫',align: 'center',width: 150},
- {field: 'UDF1',title: '鑷畾涔夊垪1',align: 'center',width: 140},
- {field: 'UDF2',title: '鑷畾涔夊垪2',align: 'center',width: 140},
- {field: 'UDF3',title: '鑷畾涔夊垪3',align: 'center',width: 140},
- {field: 'UDF4',title: '鑷畾涔夊垪4',align: 'center',width: 140},
- {field: 'UDF5',title: '鑷畾涔夊垪5',align: 'center',width: 140,templet:'#templetUDF5'},
+ // {field: 'PackagName',title: '鍖呰鍚嶇О',align: 'center',width: 110,},
+ // {field: 'IsBale',title: '鏄惁瑁瑰寘',align: 'center',width: 150},
+ // {field: 'IsBelt',title: '鏄惁鎵撳甫',align: 'center',width: 150},
+ // {field: 'UDF1',title: '鑷畾涔夊垪1',align: 'center',width: 140},
+ // {field: 'UDF2',title: '鑷畾涔夊垪2',align: 'center',width: 140},
+ // {field: 'UDF3',title: '鑷畾涔夊垪3',align: 'center',width: 140},
+ // {field: 'UDF4',title: '鑷畾涔夊垪4',align: 'center',width: 140},
+ // {field: 'UDF5',title: '鑷畾涔夊垪5',align: 'center',width: 140,templet:'#templetUDF5'},
{field: 'CreateUserName',title: '鍒涘缓浜�',align: 'center',width: 100},
{field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center',width: 160,templet: '#templetCreateTime2'},
{field: 'UpdateUserName',title: '淇敼浜�',align: 'center',width: 150,},
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index 55b4d25..c1b8bc1 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -190,18 +190,30 @@
{{# } else if(d.BitPalletMark == '1') { }}
<p>鏄�</p>
{{# } }}
- <script type="text/html" id="InspectPalletStatus">
- {{# if(d.PalletStatus=='0'){ }}
- <p>鍑�妗�</p>
- {{# } else if(d.PalletStatus == '1') { }}
- <p>棰勬贩</p>
- {{# } else if(d.PalletStatus == '2') { }}
- <p>鍗婃垚鍝�</p>
- {{# } else if(d.PalletStatus == '3') { }}
- <p>鑴忔《</p>
- {{# } }}
- </script>
</script>
+ <script type="text/html" id="InspectPalletStatus">
+ {{# function GetBtn11(d){
+ var html = ``;
+ if(d.PalletStatus=='0'){
+ html = `鍑�妗禶;
+ } else if(d.PalletStatus=='1') {
+ html = `棰勬贩`;
+ } else if(d.PalletStatus=='2') {
+ html = `鍗婃垚鍝乣;
+ }else if(d.PalletStatus=='3') {
+ html = `鑴忔《`;
+ }
+ return html;
+ }
+ }}
+ {{ GetBtn11(d) }}
+ </script>
+ <script type="text/html" id="toolbarDemo">
+
+ <button class="layui-btn layuiadmin-btn-list layui-btn-sm addClass" lay-event="add">
+ <i class="layui-icon"></i>娣诲姞
+ </button>
+ </script>
</div>
</div>
</div>
@@ -331,11 +343,11 @@
var TotalColsArr = [[
{field: '',title: '搴忓彿',type:'numbers',align: 'center',fixed: 'left', "disabled": true},
{field: 'WareHouseName', title: '鎵�灞炰粨搴�', align: 'center'},
- {field: 'RoadwayName', title: '鎵�灞炲贩閬�', align: 'center'},
+ //{field: 'RoadwayName', title: '鎵�灞炲贩閬�', align: 'center'},
{field: 'AreaName', title: '鎵�灞炲尯鍩�', align: 'center'},
{field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center'},
{field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center'},
- {field: 'PalletStatus', title: '鎵樼洏鐘舵��', align: 'center', templet: '#InspectPalletStatus'},
+ {field: 'PalletStatus', title: '鎵樼洏绫诲埆', align: 'center', templet: '#InspectPalletStatus'},
{field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center'},
{field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center'},
//{field: 'OwnerNo',title: '璐т富缂栫爜',align: 'center'},
@@ -378,6 +390,8 @@
limit: pageCnt,
limits: pageLimits,
even: true,
+ toolbar: '#toolbarDemo',
+ defaultToolbar: [''], //'print', 'exports'
cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
done: function(){
//鑷畾涔夊垪瀹�
@@ -423,7 +437,63 @@
});
});
//#endregion
- }
+ }
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(LAY-app-content-list)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ if (obj.event == "add") {
+ layer.open({
+ type: 2,
+ title: '娣诲姞鎵樼洏搴撳瓨鏄庣粏',
+ content: 'PalletAddFrom.html',
+ maxmin: true,
+ area: ['530px', '530px'],
+ btn: ['纭畾', '鍙栨秷'],
+ yes: function(index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index],
+ submitID = 'layuiadmin-app-form-submit',
+ submit = layero.find('iframe').contents().find('#' + submitID);
+ //鐩戝惉鎻愪氦
+ iframeWindow.layui.form.on('submit(' + submitID + ')', function(data) {
+ var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
+ //鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
+ var param = {
+ PalletNo:field.PalletNo,//鎵樼洏鐮�
+ WareHouseNo: field.WareHouseNo, //鎵�灞炰粨搴�
+ AreaNo: field.AreaNo, //鎵�灞炲尯鍩�
+ LocatNo:field.LocatNo,//鎵�灞炲偍浣�
+ PalletStatus: field.PalletStatus, //鎵樼洏绫诲埆
+ };
+ if(doing){
+ doing = false;
+ sendData(IP + "/Statistical/InsertStockDetail", param, 'post',function(res) {
+ console.log(res);
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ layer.close(index); //鍏抽棴寮瑰眰
+ refreshTable("","","","","","","","","","","","","","");
+ doing = true;
+ });
+ }
+ else
+ { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {doing = true;});
+ }
+ });
+ }
+ });
+ submit.trigger('click');
+ }
+ });
+ }
+ });
//鐩戝惉鎼滅储
form.on('submit(LAY-app-contlist-search)', function(data) {
diff --git a/HTML/views/StatisticalReport/PalletAddFrom.html b/HTML/views/StatisticalReport/PalletAddFrom.html
new file mode 100644
index 0000000..615f765
--- /dev/null
+++ b/HTML/views/StatisticalReport/PalletAddFrom.html
@@ -0,0 +1,157 @@
+<!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-block">
+ <input type="text" name="PalletNo" lay-verify="required" placeholder="璇疯緭鍏ユ墭鐩樺彿" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎵�灞炰粨搴�</label>
+ <div class="layui-input-block">
+ <select name="WareHouseNo" id="WareHouseNo" lay-verify="required" lay-search lay-filter="SelectWareHouseNo">
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎵�灞炲尯鍩�</label>
+ <div class="layui-input-block">
+ <select name="AreaNo" id="AreaNo" lay-verify="required" lay-search lay-filter="SelectAreaNo">
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎵�灞炲偍浣�</label>
+ <div class="layui-input-block">
+ <select name="LocatNo" id="LocatNo" 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-block">
+ <select name="PalletStatus" id="PalletStatus" lay-verify="" lay-search>
+ <option value=""></option>
+ <option value="1">鍑�妗�</option>
+ <option value="2">娣锋枡</option>
+ <option value="3">鍗婃垚鍝�</option>
+ <option value="4">鑴忔《</option>
+ </select>
+ </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>
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'layer'], function() {
+ var $ = layui.$,
+ form = layui.form,
+ layer = layui.layer;
+
+
+ //鑾峰彇浠撳簱
+ sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function(res) {
+ if (res.code == 0) { //鎴愬姛
+ // $("#RoadwayNo").empty();
+ for (var i = 0; i < res.data.length; i++) {
+ $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
+ res.data[i].WareHouseName + '</option>');
+ }
+ // $("select[name='WareHouseNo']").val(val);
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {});
+ }
+ });
+ //鑾峰彇鎵�灞炲尯鍩�
+ form.on('select(SelectWareHouseNo)', function (data) {
+ var WareHouseNo=$("#WareHouseNo").val();
+ if(WareHouseNo==''){
+ return;
+ }
+ sendData(IP + "/Sys/GetStorageAreaByHouseNo?wareHouseNo="+WareHouseNo, {}, 'get', function(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].AreaName + '</option>');
+ }
+ form.render('select');
+
+ getLocatList();
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {});
+ }
+ });
+ });
+
+ //鑾峰彇鍌ㄤ綅
+ form.on('select(SelectAreaNo)', function (data) {
+ getLocatList();
+ });
+ function getLocatList(){
+ var AreaNo=$("#AreaNo").val();
+ if(AreaNo==''){
+ return;
+ }
+ sendData(IP + "/Sys/GetStorageLocatList", {AreaNo:AreaNo}, 'post', function(res) {
+ if (res.code == 0) { //鎴愬姛
+ $("#LocatNo").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ for (var i = 0; i < res.data.length; i++) {
+ $("#LocatNo").append('<option value =' + res.data[i].LocatNo + '>' +
+ res.data[i].LocatNo + '</option>');
+ }
+ 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/Wms/Model/InterFaceModel/AsnModels.cs b/Wms/Model/InterFaceModel/AsnModels.cs
index 85a41a9..acd961e 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 CreateUser { get; set; }
+
+ /// <summary>
/// 鍗曟嵁鏄庣粏
/// </summary>
public List<AsnDetail> AsnDetails { get; set; }
diff --git a/Wms/Model/InterFaceModel/TaskModel.cs b/Wms/Model/InterFaceModel/TaskModel.cs
new file mode 100644
index 0000000..8829181
--- /dev/null
+++ b/Wms/Model/InterFaceModel/TaskModel.cs
@@ -0,0 +1,19 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model.InterFaceModel
+{
+ public class TaskModel
+ {
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ public string TaskNo { get; set; }
+
+ /// <summary>
+ /// 鐘舵��
+ /// </summary>
+ public string Status { get; set; }
+ }
+}
diff --git a/Wms/Model/ModelDto/DataDto/StockDetailDto.cs b/Wms/Model/ModelDto/DataDto/StockDetailDto.cs
index 8c1860a..efa4fae 100644
--- a/Wms/Model/ModelDto/DataDto/StockDetailDto.cs
+++ b/Wms/Model/ModelDto/DataDto/StockDetailDto.cs
@@ -131,15 +131,15 @@
public DateTime? ExpirationTime { get; set; }
/// <summary>
+ /// 鐘舵��
+ /// </summary>
+ public string Status { get; set; }
+
+ /// <summary>
/// 鎵樼洏鐘舵��
/// Default:0锛氬噣妗� 1锛氶娣� 2锛氬崐鎴愬搧 3锛氳剰妗�
/// </summary>
public string PalletStatus { get; set; }
-
- /// <summary>
- /// 鐘舵��
- /// </summary>
- public string Status { get; set; }
/// <summary>
/// 妫�楠屾爣璁�
diff --git a/Wms/WMS.BLL/BllTransServer/NoticeServer.cs b/Wms/WMS.BLL/BllTransServer/NoticeServer.cs
index 2a8f453..53992db 100644
--- a/Wms/WMS.BLL/BllTransServer/NoticeServer.cs
+++ b/Wms/WMS.BLL/BllTransServer/NoticeServer.cs
@@ -29,7 +29,7 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- public ErpModel CreateAsn(AsnInfo model)
+ public ErpModel CreateAsnWork(AsnInfo model)
{
try
{
@@ -55,7 +55,7 @@
Origin = string.IsNullOrEmpty(model.Origin) ? "MES" : model.Origin,
CustomerNo = model.Customer,
CustomerName = "",
- OrderCode = model.OrderCode,
+ OrderCode = model.OrderCode
};
// 鍏ュ簱鏄庣粏琛ㄤ俊鎭�
@@ -127,7 +127,7 @@
/// <param name="TaskNo"></param>
/// <param name="Status"></param>
/// <returns></returns>
- public ErpModel FinishTask(string TaskNo,string Status)
+ public ErpModel RCSFinishTask(string TaskNo,string Status)
{
try
{
@@ -552,7 +552,7 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- public SoResInfo ErpAddExportNotice(SoInfo model)
+ public SoResInfo CreateSoWork(SoInfo model)
{
try
{
diff --git a/Wms/WMS.BLL/DataServer/StockDetailServer.cs b/Wms/WMS.BLL/DataServer/StockDetailServer.cs
index 732a837..6b1cfdc 100644
--- a/Wms/WMS.BLL/DataServer/StockDetailServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockDetailServer.cs
@@ -403,5 +403,87 @@
}
}
#endregion
+
+ #region 浜屾ゼ涓氬姟
+ /// <summary>
+ /// 娣诲姞鎵樼洏搴撳瓨鏄庣粏
+ /// </summary>
+ public void InsertStockDetail(string PalletNo,string WareHouseNo,string AreaNo,string LocatNo, string PalletStatus,int userId)
+ {
+ try
+ {
+ if (string.IsNullOrEmpty(PalletNo))
+ {
+ throw new Exception("鎵樼洏鍙蜂笉鑳戒负绌�!");
+ }
+ if (string.IsNullOrEmpty(WareHouseNo))
+ {
+ throw new Exception("鎵�灞炰粨搴撲笉鑳戒负绌�!");
+ }
+ if (string.IsNullOrEmpty(AreaNo))
+ {
+ throw new Exception("鎵�灞炲尯鍩熶笉鑳戒负绌�!");
+ }
+ if (string.IsNullOrEmpty(LocatNo))
+ {
+ throw new Exception("鍌ㄤ綅鍦板潃涓嶈兘涓虹┖!");
+ }
+ if (string.IsNullOrEmpty(PalletStatus))
+ {
+ throw new Exception("鎵樼洏鐘舵�佷笉鑳戒负绌�!");
+ }
+ var palletInfo = Db.Queryable<DataStockDetail>().First(w => w.PalletNo == PalletNo);
+ if (palletInfo != null)
+ {
+ throw new Exception($"搴撳瓨涓凡鏈夌紪鍙蜂负锛歿PalletNo}鐨勬槑缁嗭紝璇峰嬁閲嶅娣诲姞!");
+ }
+ Db.BeginTran();
+
+ var comTime = DateTime.Now;
+ var model = new DataStockDetail()
+ {
+ Qty = 0,
+ LockQty = 0,
+ FrozenQty = 0,
+ InspectQty = 0,
+ WareHouseNo = WareHouseNo,//鎵�灞炰粨搴�
+ RoadwayNo = "",//鎵�灞炲贩閬�
+ AreaNo = AreaNo,//鎵�灞炲尯鍩�
+ LocatNo = LocatNo,//鍌ㄤ綅鍦板潃
+ PalletNo = PalletNo,
+ PalletNo2 = "",
+ PalletNo3 = "",
+ PalletTags = "0",
+ CompleteTime = comTime,
+ ProductionTime = null,
+ ExpirationTime = null,
+ Status = "0",
+ InspectMark = "0",
+ InspectStatus = "0",//寰呮楠�
+ BitPalletMark = "0",
+ PackagNo = "",
+ IsBale = "0",
+ IsBelt = "0",
+
+ PalletStatus = PalletStatus,
+
+ IsDel = "0",
+ CreateUser = userId,
+ CreateTime = comTime
+ };
+ //鎻掑叆搴撳瓨鏄庣粏
+ Db.Insertable(model).ExecuteCommand();
+
+ Db.CommitTran();
+ }
+ catch (Exception e)
+ {
+ //鍥炴粴浜嬪姟
+ Db.RollbackTran();
+ throw new Exception(e.Message);
+ }
+ }
+
+ #endregion
}
}
diff --git a/Wms/WMS.IBLL/IBllTransServer/INoticeServer.cs b/Wms/WMS.IBLL/IBllTransServer/INoticeServer.cs
index 5354775..e9448c5 100644
--- a/Wms/WMS.IBLL/IBllTransServer/INoticeServer.cs
+++ b/Wms/WMS.IBLL/IBllTransServer/INoticeServer.cs
@@ -12,21 +12,21 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- public ErpModel CreateAsn(AsnInfo model);
+ public ErpModel CreateAsnWork(AsnInfo model);
/// <summary>
- /// 浠诲姟瀹屾垚
+ /// 浠诲姟瀹屾垚鍙嶉
/// </summary>
/// <param name="TaskNo"></param>
/// <param name="Status"></param>
/// <returns></returns>
- public ErpModel FinishTask(string TaskNo, string Status);
+ public ErpModel RCSFinishTask(string TaskNo, string Status);
/// <summary>
/// 涓嬪彂鍑哄簱鍗�
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- public SoResInfo ErpAddExportNotice(SoInfo model);
+ public SoResInfo CreateSoWork(SoInfo model);
}
}
diff --git a/Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs b/Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs
index 4ecd5cd..e66575f 100644
--- a/Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs
+++ b/Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs
@@ -40,5 +40,10 @@
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
/// <returns></returns>
List<DataStockDetail> GetBindListDaoChu(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus);
+
+ /// <summary>
+ /// 娣诲姞鎵樼洏搴撳瓨鏄庣粏
+ /// </summary>
+ public void InsertStockDetail(string PalletNo, string WareHouseNo, string AreaNo, string LocatNo, string PalletStatus, int userId);
}
}
diff --git a/Wms/Wms/Controllers/StatisticalController.cs b/Wms/Wms/Controllers/StatisticalController.cs
index 8a87f0e..3ff28b1 100644
--- a/Wms/Wms/Controllers/StatisticalController.cs
+++ b/Wms/Wms/Controllers/StatisticalController.cs
@@ -434,5 +434,39 @@
}
#endregion
+
+ #region 浜屾ゼ涓氬姟
+ /// <summary>
+ /// 娣诲姞鎵樼洏搴撳瓨鏄庣粏
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult InsertStockDetail(StockDetailDto model)
+ {
+ try
+ {
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+ string userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(userId))
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+
+ _stockDetail.InsertStockDetail(model.PalletNo,model.WareHouseNo,model.AreaNo,model.LocatNo,model.PalletStatus,int.Parse(userId));
+
+ return Ok(new { code = 0, count = 0, msg = "娣诲姞鎴愬姛", data = "" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+
+ #endregion
}
}
diff --git a/Wms/Wms/Controllers/UpApiController.cs b/Wms/Wms/Controllers/UpApiController.cs
index 371825e..248a222 100644
--- a/Wms/Wms/Controllers/UpApiController.cs
+++ b/Wms/Wms/Controllers/UpApiController.cs
@@ -33,8 +33,9 @@
private readonly IStockCheckServer _stockCheckSvc;//鐩樼偣鍗昐vc
private readonly IProcurePlanServer _procurePlanSvc;//閲囪喘鍗昐vs
private readonly IRcsServer _rcsserver;//RCS鐩稿叧浠诲姟
+ private readonly INoticeServer _noticeSvc;//浜屾ゼ鍗曟嵁鐩稿叧
- public UpApiController(IOptions<ApiUrlConfig> setting,IExportNoticeServer exNoticeSvc,IArrivalNoticeServer arrivalNoticeServer,IStockCheckServer stockCheckSvc, IProcurePlanServer procurePlanSvc,IRcsServer rcsserver)
+ public UpApiController(IOptions<ApiUrlConfig> setting,IExportNoticeServer exNoticeSvc,IArrivalNoticeServer arrivalNoticeServer,IStockCheckServer stockCheckSvc, IProcurePlanServer procurePlanSvc,IRcsServer rcsserver, INoticeServer noticeSvc)
{
_config = setting.Value;
_exNoticeSvc = exNoticeSvc;
@@ -42,7 +43,7 @@
_stockCheckSvc = stockCheckSvc;
_procurePlanSvc = procurePlanSvc;
_rcsserver = rcsserver;
-
+ _noticeSvc = noticeSvc;
}
#endregion
@@ -449,6 +450,10 @@
}
}
+ result.Message = e.Message;
+ return Ok(result);
+ }
+ }
//绠辩爜淇℃伅 鎵嬫寔缁勬墭鐢� (璧嬬爜鎴栬拷婧笅鍙戝埌wms)
//璐ㄦ缁撴灉涓嬪彂鎺ュ彛
--
Gitblit v1.8.0