From 1f61b7db7c7df90929cbb7af7aa8756fded45ed3 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期五, 27 六月 2025 08:21:56 +0800
Subject: [PATCH] 修复程序问题
---
Pda/View/AsnSetting/WorkshopIn.html | 91 +++--
Pda/View/AsnSetting/printLabels.html | 529 ++++++++++++++++++------------------
Wms/Wms/Controllers/UpApiController.cs | 18
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 8
Pda/View/SoSetting/WorkshopOut.html | 91 +++--
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 22 +
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 5
Wms/Wms/Controllers/PdaAsnController.cs | 15
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 4
9 files changed, 419 insertions(+), 364 deletions(-)
diff --git a/Pda/View/AsnSetting/WorkshopIn.html b/Pda/View/AsnSetting/WorkshopIn.html
index 6a4eeac..8d041de 100644
--- a/Pda/View/AsnSetting/WorkshopIn.html
+++ b/Pda/View/AsnSetting/WorkshopIn.html
@@ -109,7 +109,7 @@
<div id="content1">
<div id="zongDiv" class="layout-bill-info" style="height: 285px;">
<form class="layui-form" action="">
-
+
<div id="" class="layui-form-item layout-input">
<label class="layui-form-label" lang>鎵樼洏鏉＄爜锛�</label>
<div class="layui-input-block">
@@ -125,10 +125,10 @@
</div>
</div>
<div id="" class="layui-form-item layout-input">
- <label class="layui-form-label" lang>鏁伴噺锛�</label>
+ <label class="layui-form-label" lang>鏁伴噺锛�</label>
<div class="layui-input-block">
<input id="BoxNum" type="number" lay-verify="required" lang langholder
- placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" class="layui-input"
+ placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" class="layui-input"
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
</div>
</div>
@@ -163,7 +163,7 @@
</div>
</div>
</td>
-
+
</tr>
</table>
@@ -186,17 +186,18 @@
<div id="content2">
<div id="zongDiv2" class="layout-bill-info" style="height: 255px;">
<form class="layui-form" id="form2" action="">
- <div id="" class="layui-form-item layout-input">
+ <div id="" class="layui-form-item layout-input">
<label class="layui-form-label" lang>鐗╂枡缂栫爜锛�</label>
<div class="layui-input-block">
- <input id="SkuNo" type="text" lay-verify="stock" lang langholder
- placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" autocomplete="off" class="layui-input">
+ <input id="SkuNo" type="text" lay-verify="stock" lang langholder placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�"
+ autocomplete="off" class="layui-input">
</div>
- </div><div id="" class="layui-form-item layout-input">
+ </div>
+ <div id="" class="layui-form-item layout-input">
<label class="layui-form-label" lang>鎵规鍙凤細</label>
<div class="layui-input-block">
- <input id="LotNo2" type="text" lay-verify="stock" lang langholder
- placeholder="璇疯緭鍏ユ壒娆�" autocomplete="off" class="layui-input">
+ <input id="LotNo2" type="text" lay-verify="stock" lang langholder placeholder="璇疯緭鍏ユ壒娆�"
+ autocomplete="off" class="layui-input">
</div>
</div>
<div id="" class="layui-form-item layout-input">
@@ -337,7 +338,7 @@
initLanguage()
setLanguage()
-
+
//鏄惁杩炵画缁勬墭
isContinue = "0";
@@ -405,48 +406,60 @@
//绠辩爜鍥炶溅浜嬩欢
- $("#BoxCode").keydown(function (e) {
- if (e.keyCode === 13) {
- if ($("#BoxCode").val() == "") {
- layer.msg('璇峰厛鎵弿绠辩爜', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return
- }
- checkBoxInfo()
+ // $("#BoxCode").keydown(function (e) {
+ // if (e.keyCode === 13) {
+ // if ($("#BoxCode").val() == "") {
+ // layer.msg('璇峰厛鎵弿绠辩爜', {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // });
+ // return
+ // }
+ // checkBoxInfo()
+ // }
+ // });
+
+ // 绠辩爜澶卞幓鐒︾偣鏃跺嚭鍙�
+ $("#BoxCode").blur(function () {
+ if ($("#BoxCode").val() == "") {
+ layer.msg('璇峰厛鎵弿绠辩爜', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return
}
- });
+ checkBoxInfo()
+ })
//绠卞洖杞︿簨浠�
function checkBoxInfo() {
-
-
+
+
var param = {
"boxNo": $("#BoxCode").val(),
}
synData(IP + "/PdaAsn/GetWmsBoxInfos", param, 'get', function (res) {
-
+
if (res.code == 0) { //鎴愬姛
$("#BoxNum").val(res.data[0].Qty);
$("#SkuName").val(res.data[0].SkuName);
$("#LotNo").val(res.data[0].LotNo);
-
+
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
-
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+
}
});
- }
-
+ }
+
//缁戝畾鍒版墭鐩樹簨浠�
form.on('submit(formBind)', function (data) {
if (xianshiyemian == 0) {
-
+
if ($("#PalletNo").val() == "") {
layer.msg('璇锋壂鎻忔墭鐩樻潯鐮�', {
icon: 2,
@@ -465,7 +478,7 @@
PalletNo: $("#PalletNo").val(),
BoxNo: $("#BoxCode").val(),
SkuQty: parseFloat($("#BoxNum").val()), //鐗╂枡鏁伴噺
- AreaNo:$("#area").val(),
+ AreaNo: $("#area").val(),
TableType: xianshiyemian,
}
console.log(param)
@@ -480,7 +493,7 @@
$("#BoxNum").val("");
$("#SkuName").val("");
$("#LotNo").val("");
-
+
});
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
@@ -514,12 +527,12 @@
});
return;
}
- var param = {
+ var param = {
PalletNo: $("#PalletNo2").val(),
SkuNo: $("#SkuNo").val(),
LotNo: $("#LotNo2").val(),
SkuQty: parseFloat($("#SkuQty2").val()), //鐗╂枡鏁伴噺
- AreaNo:$("#area").val(),
+ AreaNo: $("#area").val(),
TableType: xianshiyemian,
}
console.log(param)
@@ -534,7 +547,7 @@
$("#SkuNo").val("");
$("#SkuQty2").val("");
$("#LotNo2").val("");
-
+
});
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
@@ -550,7 +563,7 @@
return false; //闃绘琛ㄥ崟璺宠浆銆傚鏋滈渶瑕佽〃鍗曡烦杞紝鍘绘帀杩欐鍗冲彲銆�
});
-
+
/*鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��*/
diff --git a/Pda/View/AsnSetting/printLabels.html b/Pda/View/AsnSetting/printLabels.html
index 0fcbcdf..dcb95f6 100644
--- a/Pda/View/AsnSetting/printLabels.html
+++ b/Pda/View/AsnSetting/printLabels.html
@@ -1,276 +1,267 @@
-
<!DOCTYPE html>
<html>
- <head>
- <meta charset="UTF-8" />
- <meta name="viewport" content="user-scalable=0,width=device-width,initial-scale=1.0" />
- <!-- <meta name="viewport" content="width=device-width, initial-scale=0.665, minimum-scale=0.5, maximum-scale=2.0, user-scalable=no" /> -->
- <meta http-equiv="X-UA-Compatible" content="ie=edge" />
- <title>Boxline PDA</title>
- <link rel="stylesheet" href="/layui/css/layui.css" />
- <link rel="stylesheet" href="/css/style.css" />
- <script src="/js/adaptive.js"></script>
- <link rel="stylesheet" href="/css/my.css" />
- <link rel="stylesheet" href="/css/adapter.css" />
- <style type="text/css">
- .layout-bill-info {
- height: 255px;
- }
- .layout-tbl-submit {
- margin-top: 10px;
- }
- </style>
- </head>
- <body>
- <div id="" class="main-content">
- <div id="" class="layout-title">
- <table border="" cellspacing="" cellpadding="">
- <tr>
- <td class="img-back"><a href="../index.html"><img src="/assets/back.jpg" ></a></td>
- <td class="title-text">绾胯竟鏍囩</td>
- <td class="title-menu-icon"><img id="menuImg" src="/assets/menu.jpg" ></td>
- </tr>
- </table>
+<head>
+ <meta charset="UTF-8" />
+ <meta name="viewport" content="user-scalable=0,width=device-width,initial-scale=1.0" />
+ <!-- <meta name="viewport" content="width=device-width, initial-scale=0.665, minimum-scale=0.5, maximum-scale=2.0, user-scalable=no" /> -->
+ <meta http-equiv="X-UA-Compatible" content="ie=edge" />
+ <title>Boxline PDA</title>
+
+ <link rel="stylesheet" href="/layui/css/layui.css" />
+ <link rel="stylesheet" href="/css/style.css" />
+ <script src="/js/adaptive.js"></script>
+ <link rel="stylesheet" href="/css/my.css" />
+ <link rel="stylesheet" href="/css/adapter.css" />
+ <style type="text/css">
+ .layout-bill-info {
+ height: 255px;
+ }
+
+ .layout-tbl-submit {
+ margin-top: 10px;
+ }
+ </style>
+</head>
+
+<body>
+ <div id="" class="main-content">
+ <div id="" class="layout-title">
+ <table border="" cellspacing="" cellpadding="">
+ <tr>
+ <td class="img-back"><a href="../index.html"><img src="/assets/back.jpg"></a></td>
+ <td class="title-text">绾胯竟鏍囩</td>
+ <td class="title-menu-icon"><img id="menuImg" src="/assets/menu.jpg"></td>
+ </tr>
+ </table>
+ </div>
+ <div id="" class="layout-sub-content">
+ <div id="menuList" class="menu">
+ <ul class="" style="text-align: center;">
+ <li><a href="../index.html">涓婚〉</a></li>
+ <li><a href="../login.html">閲嶆柊鐧诲綍</a></li>
+ </ul>
</div>
- <div id="" class="layout-sub-content">
- <div id="menuList" class="menu">
- <ul class="" style="text-align: center;">
- <li><a href="../index.html">涓婚〉</a></li>
- <li><a href="../login.html">閲嶆柊鐧诲綍</a></li>
- </ul>
- </div>
- <div>
- <button id="click" class="layout-btn" type="button" style="background-color: #999; width: 100%;text-align: center; margin-top: 2px;">杩炴帴钃濈墮</button>
- </div>
- <div id="zongDiv2" class="layout-bill-info" style="height: 255px;">
- <form class="layui-form" id="form2" action="">
- <div id="" class="layui-form-item layout-input">
- <label class="layui-form-label" lang>鐗╂枡缂栫爜锛�</label>
- <div class="layui-input-block">
- <input id="skuNo" type="text" placeholder="" autocomplete="off" class="layui-input" >
- </div>
- </div>
+ <div>
+ <button id="click" class="layout-btn" type="button"
+ style="background-color: #999; width: 100%;text-align: center; margin-top: 2px;">杩炴帴钃濈墮</button>
+ </div>
+ <div id="zongDiv2" class="layout-bill-info" style="height: 255px;">
+ <form class="layui-form" id="form2" action="">
+ <div id="" class="layui-form-item layout-input">
+ <label class="layui-form-label" lang>鐗╂枡缂栫爜锛�</label>
+ <div class="layui-input-block">
+ <input id="skuNo" type="text" placeholder="" autocomplete="off" class="layui-input">
+ </div>
+ </div>
- <div class="layui-form-item layout-input" style="margin-top: 10px;">
- <label class="layui-form-label">鐗╂枡鍚嶇О锛�</label>
- <div class="layui-input-block">
- <input id="skuName" type="text" placeholder=""
- autocomplete="off" class="layui-input" >
- </div>
- </div>
- <div class="layui-form-item layout-input" style="margin-top: 10px;">
- <label class="layui-form-label">鎵规鍙�:</label>
- <div class="layui-input-block">
- <input id="lotNo" type="text" placeholder=""
- autocomplete="off" class="layui-input" >
- </div>
- </div>
- <div class="layui-form-item layout-input" style="margin-top: 10px;">
- <label class="layui-form-label">鐢熶骇鏃ユ湡:</label>
- <div class="layui-input-block">
- <input id="timeFrom" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
- autocomplete="off" class="measureDate" style="padding-left: 0px;">
- </div>
- </div>
- <div class="layui-form-item layout-input" style="margin-top: 10px;">
- <label class="layui-form-label">鏈夋晥鏈�:</label>
- <div class="layui-input-block">
- <input id="timeEnd" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
- autocomplete="off" class="measureDate" style="padding-left: 0px;">
- </div>
- </div>
- <div class="layui-form-item layout-input" style="margin-top: 10px;">
- <label class="layui-form-label">绠卞唴鏁伴噺:</label>
- <div class="layui-input-block">
- <input id="skuNum" type="text" placeholder=""
- autocomplete="off" class="layui-input" >
- </div>
- </div>
+ <div class="layui-form-item layout-input" style="margin-top: 10px;">
+ <label class="layui-form-label">鐗╂枡鍚嶇О锛�</label>
+ <div class="layui-input-block">
+ <input id="skuName" type="text" placeholder="" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item layout-input" style="margin-top: 10px;">
+ <label class="layui-form-label">鎵规鍙�:</label>
+ <div class="layui-input-block">
+ <input id="lotNo" type="text" placeholder="" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item layout-input" style="margin-top: 10px;">
+ <label class="layui-form-label">鐢熶骇鏃ユ湡:</label>
+ <div class="layui-input-block">
+ <input id="timeFrom" type="date" placeholder="璇烽�夋嫨鏃ユ湡" autocomplete="off" class="measureDate"
+ style="padding-left: 0px;">
+ </div>
+ </div>
+ <div class="layui-form-item layout-input" style="margin-top: 10px;">
+ <label class="layui-form-label">鏈夋晥鏈�:</label>
+ <div class="layui-input-block">
+ <input id="timeEnd" type="date" placeholder="璇烽�夋嫨鏃ユ湡" autocomplete="off" class="measureDate"
+ style="padding-left: 0px;">
+ </div>
+ </div>
+ <div class="layui-form-item layout-input" style="margin-top: 10px;">
+ <label class="layui-form-label">绠卞唴鏁伴噺:</label>
+ <div class="layui-input-block">
+ <input id="skuNum" type="text" placeholder="" autocomplete="off" class="layui-input">
+ </div>
+ </div>
- <table class="layout-tbl-submit" border="" cellspacing="" cellpadding="">
- <tr>
- <td style="width: 23%;"></td>
- <td>
- <button id="click2" class="layout-btn layout-btn-red" lang type="button" lay-submit
- lay-filter="formBind">鎵撳嵃鏍囩</button>
- </td>
- <td style="width: 33%;"></td>
+ <table class="layout-tbl-submit" border="" cellspacing="" cellpadding="">
+ <tr>
+ <td style="width: 23%;"></td>
+ <td>
+ <button id="click2" class="layout-btn layout-btn-red" lang type="button" lay-submit
+ lay-filter="formBind">鎵撳嵃鏍囩</button>
+ </td>
+ <td style="width: 33%;"></td>
- </tr>
- </table>
- </form>
- </div>
- <div id="" class="layout-bill-info">
- </div>
+ </tr>
+ </table>
+ </form>
+ </div>
+ <div id="" class="layout-bill-info">
</div>
</div>
-
- <script src="/js/jquery-3.5.1.min.js"></script>
- <script src="/layui/layui.js"></script>
- <script src="/js/public.js"></script>
- <script src="/js/jquery.cookie.js"></script>
-
- <script src="/js/uni.webview.1.5.2.js"></script>
- <!-- <script type="text/javascript" src="https://js.cdn.aliyun.dcloud.net.cn/dev/uni-app/uni.webview.1.5.2.js"></script> -->
+ </div>
- <script type="text/javascript">
- let date = new Date();
- let yyyy = date.getFullYear();
- let MM = (date.getMonth() + 1) < 10 ? ("0" + (date.getMonth() + 1)) : (date.getMonth() + 1);
- let dd = date.getDate() < 10 ? ("0" + date.getDate()) : date.getDate();
- // let HH = date.getHours() < 10 ? ("0" + date.getHours()) : date.getHours();
- // let mm = date.getMinutes() < 10 ? ("0" + date.getMinutes()) : date.getMinutes();
- let curDay = yyyy + '-' + MM + '-' + dd ;//+ 'T' + HH + ':' + mm;
- $('.measureDate').val(curDay);
- console.log(curDay);
- </script>
+ <script src="/js/jquery-3.5.1.min.js"></script>
+ <script src="/layui/layui.js"></script>
+ <script src="/js/public.js"></script>
+ <script src="/js/jquery.cookie.js"></script>
- <script>
- var dataLists;
- layui.use(['form', 'jquery'], function() {
- var form = layui.form
- // 閾炬帴钃濈墮
- $("#menuImg").click(function(e){
- e.stopPropagation()
-
- if($("#menuList").is(":hidden")){
- $("#menuList").show()
- }else{
- $("#menuList").hide()
- }
- })
- $('body').click(function(){
+ <script src="/js/uni.webview.1.5.2.js"></script>
+ <!-- <script type="text/javascript" src="https://js.cdn.aliyun.dcloud.net.cn/dev/uni-app/uni.webview.1.5.2.js"></script> -->
+
+ <script type="text/javascript">
+ let date = new Date();
+ let yyyy = date.getFullYear();
+ let MM = (date.getMonth() + 1) < 10 ? ("0" + (date.getMonth() + 1)) : (date.getMonth() + 1);
+ let dd = date.getDate() < 10 ? ("0" + date.getDate()) : date.getDate();
+ // let HH = date.getHours() < 10 ? ("0" + date.getHours()) : date.getHours();
+ // let mm = date.getMinutes() < 10 ? ("0" + date.getMinutes()) : date.getMinutes();
+ let curDay = yyyy + '-' + MM + '-' + dd;//+ 'T' + HH + ':' + mm;
+ $('.measureDate').val(curDay);
+ console.log(curDay);
+ </script>
+
+ <script>
+ var dataLists;
+ layui.use(['form', 'jquery'], function () {
+ var form = layui.form
+ // 閾炬帴钃濈墮
+ $("#menuImg").click(function (e) {
+ e.stopPropagation()
+
+ if ($("#menuList").is(":hidden")) {
+ $("#menuList").show()
+ } else {
$("#menuList").hide()
- })
-
-
- //鐗╂枡缂栫爜澶卞幓鐒︾偣浜嬩欢
- $("#skuNo").on('blur',function (e) {
- if ($("#skuNo").val() == "") {
- layer.msg('璇疯緭鍏ョ墿鏂欑紪鐮�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return
- }
-
- getSkuInfo();
- });
-
-
- //鐗╂枡鍚嶇О澶卞幓鐒︾偣浜嬩欢
- $("#skuName").on('blur',function (e) {
- if ($("#skuName").val() == "") {
- layer.msg('璇疯緭鍏ョ墿鏂欑紪鐮佸悕绉�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return
- }
-
- getSkuInfo();
- });
-
- // 楠岃瘉鑾峰彇鐗╂枡淇℃伅
- function getSkuInfo(){
- var param = {
- SkuNo:$("#skuNo").val(),
- SkuName:$("#skuName").val()
- }
-
- synData(IP + "/PdaAsn/getSkuInfo", param, 'post', function (res) {
- console.log(JSON.stringify(res))
- if (res.code == 0 && res.data != null) { //鎴愬姛
- console.log(res.data);
- $("#skuNo").val(res.data.SkuNo);
- $("#skuName").val(res.data.SkuName);
- }else{
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
-
- });
}
})
+ $('body').click(function () {
+ $("#menuList").hide()
+ })
- document.addEventListener("UniAppJSBridgeReady", function () {
- document.getElementById("click").addEventListener("click", function () {
- let data = {
- type: "search"
- };
- console.log("缁� uni-app 鍙戦�佹暟鎹�", data);
- uni.postMessage({
- data: data,
- });
+ //鐗╂枡缂栫爜澶卞幓鐒︾偣浜嬩欢
+ $("#skuNo").on('blur', function (e) {
+ if ($("#skuNo").val() == "") {
+ layer.msg('璇疯緭鍏ョ墿鏂欑紪鐮�', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
});
- document.getElementById("click2").addEventListener("click", function () {
- // 楠岃瘉蹇呭～椤�
- if ($("#skuNo").val() == "") {
- layer.msg('鐗╂枡缂栫爜涓嶅彲涓簄ull', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
+ return
+ }
- if ($("#skuName").val() == "") {
- layer.msg('鐗╂枡鍚嶇О涓嶅彲涓簄ull', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
+ getSkuInfo();
+ });
- if ($("#lotNo").val() == "") {
- layer.msg('鎵规鍙蜂笉鍙负null', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
- if ($("#skuNum").val() == "") {
- layer.msg('绠卞唴鏁伴噺涓嶅彲涓簄ull', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
+ //鐗╂枡鍚嶇О澶卞幓鐒︾偣浜嬩欢
+ $("#skuName").on('blur', function (e) {
+ if ($("#skuName").val() == "") {
+ layer.msg('璇疯緭鍏ョ墿鏂欑紪鐮佸悕绉�', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return
+ }
- // 鍙傛暟
- var param = {
- SkuNo:$("#skuNo").val(),
- SkuName:$("#skuName").val(),
- LotNo:$("#lotNo").val(),
- TimeFrom:$("#timeFrom").val(),
- TimeEnd:$("#timeEnd").val(),
- SkuNum:$("#skuNum").val()
- }
+ getSkuInfo();
+ });
- // 瀛樺偍鏂版爣绛�
- synData(IP + "/PdaAsn/AddLabels", param, 'post', function (res) {
- console.log(JSON.stringify(res))
- if (res.code == 0 && res.data != null) { //鎴愬姛
- console.log(res.data);
- dataLists = res.data;
- }else{
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
+ // 楠岃瘉鑾峰彇鐗╂枡淇℃伅
+ function getSkuInfo() {
+ var param = {
+ SkuNo: $("#skuNo").val(),
+ SkuName: $("#skuName").val()
+ }
+ synData(IP + "/PdaAsn/getSkuInfo", param, 'post', function (res) {
+ console.log(JSON.stringify(res))
+ if (res.code == 0 && res.data != null) { //鎴愬姛
+ console.log(res.data);
+ $("#skuNo").val(res.data.SkuNo);
+ $("#skuName").val(res.data.SkuName);
+ } else {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
});
+ return;
+ }
+
+ });
+ }
+ })
+
+ document.addEventListener("UniAppJSBridgeReady", function () {
+ document.getElementById("click").addEventListener("click", function () {
+ let data = {
+ type: "search"
+ };
+ console.log("缁� uni-app 鍙戦�佹暟鎹�", data);
+
+ uni.postMessage({
+ data: data,
+ });
+ });
+ document.getElementById("click2").addEventListener("click", function () {
+ // 楠岃瘉蹇呭～椤�
+ if ($("#skuNo").val() == "") {
+ layer.msg('鐗╂枡缂栫爜涓嶅彲涓簄ull', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
+
+ if ($("#skuName").val() == "") {
+ layer.msg('鐗╂枡鍚嶇О涓嶅彲涓簄ull', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
+
+ if ($("#lotNo").val() == "") {
+ layer.msg('鎵规鍙蜂笉鍙负null', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
+
+ if ($("#skuNum").val() == "") {
+ layer.msg('绠卞唴鏁伴噺涓嶅彲涓簄ull', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
+
+ // 鍙傛暟
+ var param = {
+ SkuNo: $("#skuNo").val(),
+ SkuName: $("#skuName").val(),
+ LotNo: $("#lotNo").val(),
+ TimeFrom: $("#timeFrom").val(),
+ TimeEnd: $("#timeEnd").val(),
+ SkuNum: $("#skuNum").val()
+ }
+
+ // 瀛樺偍鏂版爣绛�
+ synData(IP + "/PdaAsn/AddLabels", param, 'post', function (res) {
+ console.log(JSON.stringify(res))
+ if (res.code == 0 && res.data != null) { //鎴愬姛
+ console.log(res.data);
+ dataLists = res.data;
let data = {
type: "print",
- listData:dataLists
+ listData: dataLists
// {
// SkuNo:'541100554848',
// SkuName:'钁¤悇绯栬憽钀勭硸钁¤悇绯栬憽钀勭硸钁¤悇绯�',
@@ -290,24 +281,34 @@
uni.postMessage({
data: data,
});
- });
+ } else {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
+
});
-
- </script>
- <script type="text/javascript">
- // window.jsfunction = function (data) {
- // let canshutype = typeof data;
- // let mes = typeof data == "object" ? JSON.stringify(data) : data;
- // alert("鏀跺埌鍙傛暟" + canshutype);
- // document.getElementById("messageText").innerHTML =
- // "鎭枩浣狅紝鎺ユ敹鍒颁綘鐨勫弬鏁癨n锛屽弬鏁版槸" + canshutype + "鍙傛暟濡備笅:\n" + mes;
- // console.log("data", data);
- // };
-
-
- </script>
- </body>
-</html>
-
\ No newline at end of file
+ });
+ });
+
+ </script>
+ <script type="text/javascript">
+ // window.jsfunction = function (data) {
+ // let canshutype = typeof data;
+ // let mes = typeof data == "object" ? JSON.stringify(data) : data;
+ // alert("鏀跺埌鍙傛暟" + canshutype);
+ // document.getElementById("messageText").innerHTML =
+ // "鎭枩浣狅紝鎺ユ敹鍒颁綘鐨勫弬鏁癨n锛屽弬鏁版槸" + canshutype + "鍙傛暟濡備笅:\n" + mes;
+ // console.log("data", data);
+ // };
+
+
+
+ </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/Pda/View/SoSetting/WorkshopOut.html b/Pda/View/SoSetting/WorkshopOut.html
index 95e1c08..54eb6c7 100644
--- a/Pda/View/SoSetting/WorkshopOut.html
+++ b/Pda/View/SoSetting/WorkshopOut.html
@@ -109,7 +109,7 @@
<div id="content1">
<div id="zongDiv" class="layout-bill-info" style="height: 285px;">
<form class="layui-form" action="">
-
+
<div id="" class="layui-form-item layout-input">
<label class="layui-form-label" lang>鎵樼洏鏉＄爜锛�</label>
<div class="layui-input-block">
@@ -124,24 +124,24 @@
placeholder="璇锋壂鎻忓绠辨潯鐮�" autocomplete="off" class="layui-input">
</div>
</div>
-
+
<table class="layout-tbl-input" border="" cellspacing="" cellpadding="">
<tr>
<td>
<div id="" class="layui-form-item layout-boxinfo">
<label class="layui-form-label" style=" width: 21%;" lang>鎵规:</label>
- <div class="layui-input-block" style=" width: 79%;margin-left: 21%;" >
+ <div class="layui-input-block" style=" width: 79%;margin-left: 21%;">
<input id="LotNo" type="text" disabled placeholder="" autocomplete="off"
class="layui-input">
</div>
</div>
</td>
</tr>
- <tr>
- <td>
+ <tr>
+ <td>
<div id="" class="layui-form-item layout-boxinfo">
<label class="layui-form-label" style=" width: 21%;" lang>鐗╂枡鍚嶇О锛�</label>
- <div class="layui-input-block" style=" width: 79%;margin-left: 21%;" >
+ <div class="layui-input-block" style=" width: 79%;margin-left: 21%;">
<input id="SkuName" type="text" disabled placeholder="" autocomplete="off"
class="layui-input">
</div>
@@ -169,17 +169,18 @@
<div id="content2">
<div id="zongDiv2" class="layout-bill-info" style="height: 255px;">
<form class="layui-form" id="form2" action="">
- <div id="" class="layui-form-item layout-input">
+ <div id="" class="layui-form-item layout-input">
<label class="layui-form-label" lang>鐗╂枡缂栫爜锛�</label>
<div class="layui-input-block">
- <input id="SkuNo" type="text" lay-verify="stock" lang langholder
- placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" autocomplete="off" class="layui-input">
+ <input id="SkuNo" type="text" lay-verify="stock" lang langholder placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�"
+ autocomplete="off" class="layui-input">
</div>
- </div><div id="" class="layui-form-item layout-input">
+ </div>
+ <div id="" class="layui-form-item layout-input">
<label class="layui-form-label" lang>鎵规鍙凤細</label>
<div class="layui-input-block">
- <input id="LotNo2" type="text" lay-verify="stock" lang langholder
- placeholder="璇疯緭鍏ユ壒娆�" autocomplete="off" class="layui-input">
+ <input id="LotNo2" type="text" lay-verify="stock" lang langholder placeholder="璇疯緭鍏ユ壒娆�"
+ autocomplete="off" class="layui-input">
</div>
</div>
<div id="" class="layui-form-item layout-input">
@@ -320,7 +321,7 @@
initLanguage()
setLanguage()
-
+
//鏄惁杩炵画缁勬墭
isContinue = "0";
@@ -388,18 +389,32 @@
//绠辩爜鍥炶溅浜嬩欢
- $("#BoxCode").keydown(function (e) {
- if (e.keyCode === 13) {
- if ($("#BoxCode").val() == "") {
- layer.msg('璇峰厛鎵弿绠辩爜', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return
- }
- checkBoxInfo()
+ // $("#BoxCode").keydown(function (e) {
+ // if (e.keyCode === 13) {
+ // if ($("#BoxCode").val() == "") {
+ // layer.msg('璇峰厛鎵弿绠辩爜', {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // });
+ // return
+ // }
+ // checkBoxInfo()
+ // }
+ // });
+
+
+ // 绠辩爜澶卞幓鐒︾偣鏃跺嚭鍙�
+ $("#BoxCode").blur(function () {
+ if ($("#BoxCode").val() == "") {
+ layer.msg('璇峰厛鎵弿绠辩爜', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return
}
- });
+ checkBoxInfo()
+ })
+
//绠卞洖杞︿簨浠�
function checkBoxInfo() {
@@ -407,26 +422,26 @@
"BoxNo": $("#BoxCode").val(),
}
sendData(IP + "/PdaSo/GetWmsBoxInfos", param, 'get', function (res) {
-
+
if (res.code == 0) { //鎴愬姛
$("#SkuName").val(res.data[0].SkuName);
$("#LotNo").val(res.data[0].LotNo);
-
+
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
-
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+
}
});
- }
-
+ }
+
//缁戝畾鍒版墭鐩樹簨浠�
form.on('submit(formBind)', function (data) {
if (xianshiyemian == 0) {
-
+
if ($("#PalletNo").val() == "") {
layer.msg('璇锋壂鎻忔墭鐩樻潯鐮�', {
icon: 2,
@@ -456,7 +471,7 @@
$("#BoxCode").val("");
$("#SkuName").val("");
$("#LotNo").val("");
-
+
});
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
@@ -490,12 +505,12 @@
});
return;
}
- var param = {
+ var param = {
PalletNo: $("#PalletNo2").val(),
SkuNo: $("#SkuNo").val(),
LotNo: $("#LotNo2").val(),
SkuQty: parseFloat($("#SkuQty2").val()), //鐗╂枡鏁伴噺
- AreaNo:$("#area").val(),
+ AreaNo: $("#area").val(),
TableType: xianshiyemian,
}
console.log(param)
@@ -510,7 +525,7 @@
$("#SkuNo").val("");
$("#SkuQty2").val("");
$("#LotNo2").val("");
-
+
});
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
@@ -526,7 +541,7 @@
return false; //闃绘琛ㄥ崟璺宠浆銆傚鏋滈渶瑕佽〃鍗曡烦杞紝鍘绘帀杩欐鍗冲彲銆�
});
-
+
/*鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��*/
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index e0381b5..dc4a007 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -370,7 +370,9 @@
if (string.IsNullOrWhiteSpace(detailModel.LotNo))
{
string toDayTime = DateTime.Now.ToString("yyyyMM");
- var maxBoxCodeStr = Db.Queryable<BllArrivalNoticeDetail>().Where(m => m.IsDel == "0" && m.BoxCodeStr.Contains("BK") && m.CreateTime.ToString("yyyyMMdd") == DateTime.Now.ToString("yyyyMMdd")).Max(m => m.BoxCodeStr);
+ var maxBoxCodeStr = Db.Queryable<BllArrivalNoticeDetail>()
+ .Where(m => m.IsDel == "0" && m.BoxCodeStr.Contains("BK")
+ && m.CreateTime.ToString("yyyyMM") == DateTime.Now.ToString("yyyyMM")).Max(m => m.BoxCodeStr);
if(string.IsNullOrWhiteSpace(maxBoxCodeStr))
{
maxBoxCodeStr = "BK" + toDayTime.Substring(2, 4) + "0001";
@@ -634,7 +636,9 @@
// }
//}
//detailModel.LotNo = maxLotNo;
- var maxBoxCodeStr = Db.Queryable<BllArrivalNoticeDetail>().Where(m => m.IsDel == "0" && m.BoxCodeStr.Contains("BK") && m.CreateTime.ToString("yyyyMMdd") == DateTime.Now.ToString("yyyyMMdd")).Max(m => m.BoxCodeStr);
+ var maxBoxCodeStr = Db.Queryable<BllArrivalNoticeDetail>()
+ .Where(m => m.IsDel == "0" && m.BoxCodeStr.Contains("BK")
+ && m.CreateTime.ToString("yyyyMM") == DateTime.Now.ToString("yyyyMM")).Max(m => m.BoxCodeStr);
if (string.IsNullOrWhiteSpace(maxBoxCodeStr))
{
maxBoxCodeStr = "BK" + toDayTime.Substring(2, 4) + "0001";
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 43d8ab3..43d5844 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -2452,7 +2452,7 @@
}
}
-
+ // 杞﹂棿缁戝畾鎵樼洏-璐存爣
public void ChejianIn(string palletNo,string boxNo,decimal qty,string areaNo,int userId)
{
try
@@ -2685,7 +2685,7 @@
var sqlStr = $"update SysPallets set Status = '1' where PalletNo = '{palletNo}';";
////娣诲姞鎵樼洏璁板綍琛ㄦ暟鎹�
//sqlStr += $"insert into LogPalletTrack values('{palletNo}','{boxNo}','缁勭洏','0',getDate(),{userId},NULL,NULL);";
- //Db.Ado.ExecuteCommand(sqlStr);
+ Db.Ado.ExecuteCommand(sqlStr);
new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "杞﹂棿鍏ュ簱", boxNo, "娣诲姞", $"娣诲姞浜嗘墭鐩樼爜涓猴細{palletNo}銆亄msgStr}鐨勫叆搴撲俊鎭�", userId);
//鎻愪氦浜嬪姟
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index 600b343..7154975 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -1303,9 +1303,8 @@
SkuName = boxInfo.SkuName,
LotNo = boxInfo.LotNo,
BoxNoList = new List<string>() { boxNoNew } ,
- Date1 = boxInfo.ProductionTime.ToString(),
- Date2 = boxInfo.ExpirationTime.ToString(),
-
+ Date1 = boxInfo.ProductionTime == null ? "" : Convert.ToDateTime(boxInfo.ProductionTime).ToString("yyyy-MM-dd"),
+ Date2 = boxInfo.ExpirationTime == null ? "" : Convert.ToDateTime(boxInfo.ExpirationTime).ToString("yyyy-MM-dd"),
};
#endregion
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 4cc999e..b76f141 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -1475,7 +1475,7 @@
}
}
- //杞﹂棿pda鎷ｈ揣
+ //杞﹂棿pda鎷ｈ揣 - 鏍囩
public async Task ChejianPick(string palletNo, string boxNo, int userId)
{
Db.BeginTran();
@@ -1489,7 +1489,7 @@
}
if (string.IsNullOrEmpty(boxNo))
{
- throw Oops.Bah("杩芥函鏉＄爜鍜屾嫞璐ф暟閲忎笉鑳藉悓鏃惰緭鍏�");
+ throw Oops.Bah("绠辩爜涓嶅彲涓虹┖");
}
//绠辩爜鏄庣粏
@@ -1502,26 +1502,34 @@
boxInfos = await boxInfo.ToListAsync();
//搴撳瓨鏄庣粏
- var stockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNo && m.SkuNo == boxInfos.First().SkuNo && m.LotNo == boxInfos.First().LotNo);
+ var stockDetail = await Db.Queryable<DataStockDetail>()
+ .FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNo
+ && m.SkuNo == boxInfos.First().SkuNo && m.LotNo == boxInfos.First().LotNo);
if (stockDetail == null)
{
throw Oops.Bah("鏈煡璇㈠埌璇ユ墭鐩樺垎閰嶇殑搴撳瓨鏄庣粏淇℃伅锛�");
}
+
+ // 楠岃瘉鏄惁杞﹂棿绾胯竟浠撳簱
var areaList = new List<string>() { "B06", "B07", "B09" };
if (!areaList.Contains(stockDetail.AreaNo))
{
throw Oops.Bah("鎵樼洏涓嶆槸杞﹂棿鎵樼洏锛�");
}
+
//搴撳瓨鎬昏〃
- var stock = await Db.Queryable<DataStock>().FirstAsync(a => a.IsDel == "0" && a.SkuNo == stockDetail.SkuNo && a.LotNo == stockDetail.LotNo);
+ var stock = await Db.Queryable<DataStock>()
+ .FirstAsync(a => a.IsDel == "0" && a.SkuNo == stockDetail.SkuNo && a.LotNo == stockDetail.LotNo);
if (stock == null)
{
throw Oops.Bah("鏈煡璇㈠埌璇ユ墭鐩樺垎閰嶇殑搴撳瓨淇℃伅锛�");
}
#endregion
-
var pickQty = boxInfos.Sum(m => m.Qty);
+
+ // 鍒犻櫎绠变换鍔�
+ await Db.Deleteable(boxInfos).ExecuteCommandAsync();
//鍒犻櫎鎴栦慨鏀瑰簱瀛樻槑缁�
@@ -1558,6 +1566,7 @@
{
await Db.Updateable(stock).ExecuteCommandAsync();
}
+
var num2 = await Db.Queryable<DataStockDetail>().CountAsync(m => m.IsDel == "0" && m.PalletNo == palletNo);
if (num2 <= 0)
{
@@ -1572,7 +1581,8 @@
}
//娣诲姞鎿嶄綔鏃ュ織璁板綍
- var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "杞﹂棿鍑哄簱", boxNo, "鎷ｈ揣", $"鍦≒DA涓婂绠卞彿涓猴細{boxNo}鐨勬墭鐩樼爜涓猴細{palletNo}鐨勬嫞璐ф搷浣�", userId);
+ var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "杞﹂棿鍑哄簱",
+ boxNo, "鎷ｈ揣", $"鍦≒DA涓婂绠卞彿涓猴細{boxNo}鐨勬墭鐩樼爜涓猴細{palletNo}鐨勬嫞璐ф搷浣�", userId);
Db.CommitTran();
}
catch (AppFriendlyException e)
diff --git a/Wms/Wms/Controllers/PdaAsnController.cs b/Wms/Wms/Controllers/PdaAsnController.cs
index d8829bc..2d55503 100644
--- a/Wms/Wms/Controllers/PdaAsnController.cs
+++ b/Wms/Wms/Controllers/PdaAsnController.cs
@@ -3,6 +3,7 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using Model.InterFaceModel;
+using Model.ModelDto;
using Model.ModelDto.BllAsnDto;
using Model.ModelDto.DataDto;
using Model.ModelVm;
@@ -11,6 +12,8 @@
using Model.ModelVm.SysVm;
using Newtonsoft.Json;
using System;
+using System.Collections.Generic;
+using System.Linq;
using System.Security.Claims;
using Utility;
using Utility.Tools;
@@ -37,7 +40,6 @@
_PdaAsnSvc = pdaAsnSvc;
_userManager = userManager;
}
-
#region JC34
@@ -919,7 +921,16 @@
model.userId = int.Parse(UserId);
var models = _PdaAsnSvc.AddLabels(model);
- return Ok(new { code = 0, msg = "绠辩爜鐢熸垚鎴愬姛!", data = models });
+ var data = new BoxListInfoDto();
+ data.SkuNo = model.SkuNo;
+ data.SkuName = model.SkuName;
+ data.LotNo = model.LotNo;
+ data.Date1 = model.TimeFrom == null ? "" : Convert.ToDateTime(model.TimeFrom).ToString("yyyy-MM-dd");
+ data.Date2 = model.TimeEnd == null ? "" : Convert.ToDateTime(model.TimeEnd).ToString("yyyy-MM-dd");
+ data.BoxNoList = models.Select(m => m.BoxNo).ToList();
+
+
+ return Ok(new { code = 0, msg = "绠辩爜鐢熸垚鎴愬姛!", data = data });
}
catch (Exception e)
{
diff --git a/Wms/Wms/Controllers/UpApiController.cs b/Wms/Wms/Controllers/UpApiController.cs
index 3cc0ebb..ffa1384 100644
--- a/Wms/Wms/Controllers/UpApiController.cs
+++ b/Wms/Wms/Controllers/UpApiController.cs
@@ -47,6 +47,8 @@
private readonly IPdaAsnServer _pdaAsnServer;// PDA
private readonly IHttpServer _http;
+ private string logStr = $@".\log\SAP璧嬬爜\Sap涓嬪彂鎶ユ枃" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+
public UpApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IArrivalNoticeServer arrivalNoticeServer, IStockCheckServer stockCheckSvc, IProcurePlanServer procurePlanSvc, IPdaAsnServer pdaAsnServer, IHttpServer http)
{
_config = setting.Value;
@@ -60,8 +62,6 @@
#endregion
#region JC34
-
-
/// <summary>
/// 鐗╂枡涓嬪彂
/// </summary>
@@ -71,10 +71,9 @@
[HttpPost]
public IActionResult CreateSku(object model)
{
-
try
{
-
+ LogFile.SaveLogToFile($"Sap鐗╂枡涓绘暟鎹細( {model} ),", logStr);
return Ok(new { result = true, code = "1" ,message = "success" });
}
catch (Exception e)
@@ -95,7 +94,8 @@
{
try
- {
+ {
+ LogFile.SaveLogToFile($"Sap瀹㈡埛淇℃伅涓绘暟鎹細( {model} ),", logStr);
return Ok(new { result = true, code = "1", message = "success" });
}
catch (Exception e)
@@ -117,6 +117,7 @@
try
{
+ LogFile.SaveLogToFile($"Sap鍏ュ簱鍗曚笅鍙戯細( {model} ),", logStr);
return Ok(new { result = true, code = "1", message = "success" });
}
catch (Exception e)
@@ -137,6 +138,7 @@
try
{
+ LogFile.SaveLogToFile($"Sap鍑哄簱鍗曚笅鍙戯細( {model} ),", logStr);
return Ok(new { result = true, code = "1", message = "success" });
}
catch (Exception e)
@@ -158,9 +160,9 @@
try
{
- // var sd = JsonConvert.SerializeObject(model);
- // var sd2 = JsonConvert.DeserializeObject<BoxPalletBindVm>(sd);
-
+ // var sd = JsonConvert.SerializeObject(model);
+ // var sd2 = JsonConvert.DeserializeObject<BoxPalletBindVm>(sd);
+ LogFile.SaveLogToFile($"Sap璐ㄩ噺鐘舵�佸彉鏇达細( {model} ),", logStr);
return Ok(new { result = true, code = "1", message = "success" });
}
catch (Exception e)
--
Gitblit v1.8.0