From 9335b068994ded46e7844d81967a12eb652f77ef Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 04 十一月 2025 08:05:56 +0800
Subject: [PATCH] 处理出库作业手动分配无法输入小数问题
---
Wms/Utility/Tools/HttpHelper.cs | 27 ++++++++-
Wms/Utility/XML/ExInfoXml.xml | 106 ++++++++++++++++++++++++++++++++--
HTML/views/SOSetting/ExportHandOutList.html | 2
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 8 ++
4 files changed, 129 insertions(+), 14 deletions(-)
diff --git a/HTML/views/SOSetting/ExportHandOutList.html b/HTML/views/SOSetting/ExportHandOutList.html
index 73ace4e..5a5ba5f 100644
--- a/HTML/views/SOSetting/ExportHandOutList.html
+++ b/HTML/views/SOSetting/ExportHandOutList.html
@@ -392,7 +392,7 @@
}
var item = {
StockId: parseInt(infoOptions.data[i].Id),
- Qty: parseInt(infoOptions.data[i].ExportQty)
+ Qty: parseFloat(infoOptions.data[i].ExportQty)
};
DataList.push(item);
}
diff --git a/Wms/Utility/Tools/HttpHelper.cs b/Wms/Utility/Tools/HttpHelper.cs
index 050dc00..1614f8c 100644
--- a/Wms/Utility/Tools/HttpHelper.cs
+++ b/Wms/Utility/Tools/HttpHelper.cs
@@ -217,14 +217,35 @@
//淇敼鍙傛暟鐨勫��
foreach (var de in Pars)
{
- string subNode = "DataList/Product/Batch";// + de.Key.ToString();
+ string subNode = "DataList/Events/Event/Relation/Batch";// + de.Key.ToString();
XmlNode node = xml.SelectSingleNode(subNode, nsmgr);
if (de != null)
{
XmlNode createNode = xml.CreateNode(XmlNodeType.Element, "Data", "");
- XmlAttribute attr = xml.CreateAttribute("code");
- attr.Value = de;
+ XmlAttribute attr = xml.CreateAttribute("Code"); //绠辩爜
+ attr.Value = de.Split(",")[0];
+ createNode.Attributes.Append(attr);
+ attr = xml.CreateAttribute("CorpOrderID"); //鍗曟嵁鍙�
+ attr.Value = de.Split(",")[1];
+ createNode.Attributes.Append(attr);
+ attr = xml.CreateAttribute("Actor"); //鎿嶄綔浜�
+ attr.Value = de.Split(",")[2];
+ createNode.Attributes.Append(attr);
+ attr = xml.CreateAttribute("ActDate"); //鎿嶄綔鏃堕棿
+ attr.Value = de.Split(",")[3];
+ createNode.Attributes.Append(attr);
+ attr = xml.CreateAttribute("DisCorpID"); //杩愯緭浼佷笟
+ attr.Value = "";
+ createNode.Attributes.Append(attr);
+ attr = xml.CreateAttribute("AssCorpID"); //濮旀墭浼佷笟
+ attr.Value = "";
+ createNode.Attributes.Append(attr);
+ attr = xml.CreateAttribute("ToCorpID"); // 涓嬫父鏀惰揣浼佷笟缂栧彿
+ attr.Value = "";
+ createNode.Attributes.Append(attr);
+ attr = xml.CreateAttribute("FromPerson");//鍙戣揣浜�
+ attr.Value = ""; //de.Split(",")[2]
createNode.Attributes.Append(attr);
node.AppendChild(createNode);
}
diff --git a/Wms/Utility/XML/ExInfoXml.xml b/Wms/Utility/XML/ExInfoXml.xml
index 2898d93..4a5b6b3 100644
--- a/Wms/Utility/XML/ExInfoXml.xml
+++ b/Wms/Utility/XML/ExInfoXml.xml
@@ -1,10 +1,100 @@
锘�
-<DataList xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" corpName="澶╂触甯備腑鍗囨寫鎴樼敓鐗╃鎶�鏈夐檺鍏徃"
- toUnitType="2" manCode="19053107" dataType="wareHouseOut" version="1.1"
- xsi:noNamespaceSchemaLocation="鍏借嵂浜у搧鍑哄簱鏁版嵁1.1.xsd">
- <Product>
- <Batch operator="鐢虫姤璁惧鍚嶇О" oprDate="2022/06/25" toProvince="榛戦緳姹熺渷" toCity="鍝堝皵婊ㄥ競" toCounty="鍙屽煄鍖�" toUnit="鍝堝皵婊ㄦ簮绛栧晢璐告湁闄愬叕鍙�" toUnitcode="">
- <!--<Data code="202203240009000479940290"/>-->
- </Batch>
- </Product>
+<DataList xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="鍏宠仈鍏崇郴XML Schema-3.0.xsd" License="">
+ <Events version="3.0">
+ <Event name="RelationCreate">
+ <Relation productCode="9227834" subTypeNo="9227834001" cascade="1:8:80" packageSpec="鐩�1鏀�" comment="">
+ <Batch batchNo="4202506237" madeDate="2025-06-05" validateDate="2028-06-04" workshop="1002杞﹂棿" lineName="鑷姩绾�" lineManager="璧�">
+ <!--<Code curCode="87069080001788999534" packLayer="3" parentCode="" flag="0"/>
+ <Code curCode="87069090015932071630" packLayer="2" parentCode="87069080001788999534" flag="0"/>
+ <Code curCode="83057920148372924155" packLayer="1" parentCode="87069090015932071630" flag="0"/>
+ <Code curCode="83057920148372684374" packLayer="1" parentCode="87069090015932071630" flag="0"/>
+ <Code curCode="83057920148372441040" packLayer="1" parentCode="87069090015932071630" flag="0"/>
+ <Code curCode="83057920148370761719" packLayer="1" parentCode="87069090015932071630" flag="0"/>
+ <Code curCode="83057920148371009170" packLayer="1" parentCode="87069090015932071630" flag="0"/>
+ <Code curCode="83057920148371243667" packLayer="1" parentCode="87069090015932071630" flag="0"/>
+ <Code curCode="83057920148371481519" packLayer="1" parentCode="87069090015932071630" flag="0"/>
+ <Code curCode="83057920148371726602" packLayer="1" parentCode="87069090015932071630" flag="0"/>
+ <Code curCode="83057920148371962746" packLayer="1" parentCode="87069090015932071630" flag="0"/>
+ <Code curCode="83057920148372200959" packLayer="1" parentCode="87069090015932071630" flag="0"/>
+ <Code curCode="87069090015932115065" packLayer="2" parentCode="87069080001788999534" flag="0"/>
+ <Code curCode="83057920148368842018" packLayer="1" parentCode="87069090015932115065" flag="0"/>
+ <Code curCode="83057920148369084666" packLayer="1" parentCode="87069090015932115065" flag="0"/>
+ <Code curCode="83057920148369326241" packLayer="1" parentCode="87069090015932115065" flag="0"/>
+ <Code curCode="83057920148369562000" packLayer="1" parentCode="87069090015932115065" flag="0"/>
+ <Code curCode="83057920148369801304" packLayer="1" parentCode="87069090015932115065" flag="0"/>
+ <Code curCode="83057920148370045482" packLayer="1" parentCode="87069090015932115065" flag="0"/>
+ <Code curCode="83057920148370284324" packLayer="1" parentCode="87069090015932115065" flag="0"/>
+ <Code curCode="83057920148370528448" packLayer="1" parentCode="87069090015932115065" flag="0"/>
+ <Code curCode="83057920148368600956" packLayer="1" parentCode="87069090015932115065" flag="0"/>
+ <Code curCode="83057920148368363066" packLayer="1" parentCode="87069090015932115065" flag="0"/>
+ <Code curCode="87069090015932154162" packLayer="2" parentCode="87069080001788999534" flag="0"/>
+ <Code curCode="83057920148368124892" packLayer="1" parentCode="87069090015932154162" flag="0"/>
+ <Code curCode="83057920148367880401" packLayer="1" parentCode="87069090015932154162" flag="0"/>
+ <Code curCode="83057920148365962203" packLayer="1" parentCode="87069090015932154162" flag="0"/>
+ <Code curCode="83057920148366207259" packLayer="1" parentCode="87069090015932154162" flag="0"/>
+ <Code curCode="83057920148366440713" packLayer="1" parentCode="87069090015932154162" flag="0"/>
+ <Code curCode="83057920148366684405" packLayer="1" parentCode="87069090015932154162" flag="0"/>
+ <Code curCode="83057920148366920612" packLayer="1" parentCode="87069090015932154162" flag="0"/>
+ <Code curCode="83057920148367161006" packLayer="1" parentCode="87069090015932154162" flag="0"/>
+ <Code curCode="83057920148367402706" packLayer="1" parentCode="87069090015932154162" flag="0"/>
+ <Code curCode="83057920148367647629" packLayer="1" parentCode="87069090015932154162" flag="0"/>
+ <Code curCode="87069090015932238090" packLayer="2" parentCode="87069080001788999534" flag="0"/>
+ <Code curCode="83057920148363561861" packLayer="1" parentCode="87069090015932238090" flag="0"/>
+ <Code curCode="83057920148363808974" packLayer="1" parentCode="87069090015932238090" flag="0"/>
+ <Code curCode="83057920148364044168" packLayer="1" parentCode="87069090015932238090" flag="0"/>
+ <Code curCode="83057920148364281458" packLayer="1" parentCode="87069090015932238090" flag="0"/>
+ <Code curCode="83057920148364520482" packLayer="1" parentCode="87069090015932238090" flag="0"/>
+ <Code curCode="83057920148364767590" packLayer="1" parentCode="87069090015932238090" flag="0"/>
+ <Code curCode="83057920148365004077" packLayer="1" parentCode="87069090015932238090" flag="0"/>
+ <Code curCode="83057920148365245110" packLayer="1" parentCode="87069090015932238090" flag="0"/>
+ <Code curCode="83057920148365489268" packLayer="1" parentCode="87069090015932238090" flag="0"/>
+ <Code curCode="83057920148365726586" packLayer="1" parentCode="87069090015932238090" flag="0"/>
+ <Code curCode="87069090015932033782" packLayer="2" parentCode="87069080001788999534" flag="0"/>
+ <Code curCode="83057920148373401736" packLayer="1" parentCode="87069090015932033782" flag="0"/>
+ <Code curCode="83057920148373648671" packLayer="1" parentCode="87069090015932033782" flag="0"/>
+ <Code curCode="83057920148373882492" packLayer="1" parentCode="87069090015932033782" flag="0"/>
+ <Code curCode="83057920148374121088" packLayer="1" parentCode="87069090015932033782" flag="0"/>
+ <Code curCode="83057920148374369286" packLayer="1" parentCode="87069090015932033782" flag="0"/>
+ <Code curCode="83057920148374604933" packLayer="1" parentCode="87069090015932033782" flag="0"/>
+ <Code curCode="83057920148373169131" packLayer="1" parentCode="87069090015932033782" flag="0"/>
+ <Code curCode="83057920148374848657" packLayer="1" parentCode="87069090015932033782" flag="0"/>
+ <Code curCode="83057920148375329523" packLayer="1" parentCode="87069090015932033782" flag="0"/>
+ <Code curCode="83057920148375081870" packLayer="1" parentCode="87069090015932033782" flag="0"/>
+ <Code curCode="87069090015931913483" packLayer="2" parentCode="87069080001788999534" flag="0"/>
+ <Code curCode="83057920148382283339" packLayer="1" parentCode="87069090015931913483" flag="0"/>
+ <Code curCode="83057920148382525896" packLayer="1" parentCode="87069090015931913483" flag="0"/>
+ <Code curCode="83057920148382049580" packLayer="1" parentCode="87069090015931913483" flag="0"/>
+ <Code curCode="83057920148381808684" packLayer="1" parentCode="87069090015931913483" flag="0"/>
+ <Code curCode="83057920148381323782" packLayer="1" parentCode="87069090015931913483" flag="0"/>
+ <Code curCode="83057920148380365101" packLayer="1" parentCode="87069090015931913483" flag="0"/>
+ <Code curCode="83057920148380600446" packLayer="1" parentCode="87069090015931913483" flag="0"/>
+ <Code curCode="83057920148380845965" packLayer="1" parentCode="87069090015931913483" flag="0"/>
+ <Code curCode="83057920148381089410" packLayer="1" parentCode="87069090015931913483" flag="0"/>
+ <Code curCode="83057920148381561273" packLayer="1" parentCode="87069090015931913483" flag="0"/>
+ <Code curCode="87069090015931956131" packLayer="2" parentCode="87069080001788999534" flag="0"/>
+ <Code curCode="83057920148377962860" packLayer="1" parentCode="87069090015931956131" flag="0"/>
+ <Code curCode="83057920148378204570" packLayer="1" parentCode="87069090015931956131" flag="0"/>
+ <Code curCode="83057920148378443550" packLayer="1" parentCode="87069090015931956131" flag="0"/>
+ <Code curCode="83057920148378686893" packLayer="1" parentCode="87069090015931956131" flag="0"/>
+ <Code curCode="83057920148378920964" packLayer="1" parentCode="87069090015931956131" flag="0"/>
+ <Code curCode="83057920148379164311" packLayer="1" parentCode="87069090015931956131" flag="0"/>
+ <Code curCode="83057920148379406311" packLayer="1" parentCode="87069090015931956131" flag="0"/>
+ <Code curCode="83057920148379643309" packLayer="1" parentCode="87069090015931956131" flag="0"/>
+ <Code curCode="83057920148379883846" packLayer="1" parentCode="87069090015931956131" flag="0"/>
+ <Code curCode="83057920148380125281" packLayer="1" parentCode="87069090015931956131" flag="0"/>
+ <Code curCode="87069090015931993545" packLayer="2" parentCode="87069080001788999534" flag="0"/>
+ <Code curCode="83057920148375560130" packLayer="1" parentCode="87069090015931993545" flag="0"/>
+ <Code curCode="83057920148375806129" packLayer="1" parentCode="87069090015931993545" flag="0"/>
+ <Code curCode="83057920148376048063" packLayer="1" parentCode="87069090015931993545" flag="0"/>
+ <Code curCode="83057920148376281992" packLayer="1" parentCode="87069090015931993545" flag="0"/>
+ <Code curCode="83057920148376529495" packLayer="1" parentCode="87069090015931993545" flag="0"/>
+ <Code curCode="83057920148376765510" packLayer="1" parentCode="87069090015931993545" flag="0"/>
+ <Code curCode="83057920148377000472" packLayer="1" parentCode="87069090015931993545" flag="0"/>
+ <Code curCode="83057920148377245836" packLayer="1" parentCode="87069090015931993545" flag="0"/>
+ <Code curCode="83057920148377489066" packLayer="1" parentCode="87069090015931993545" flag="0"/>
+ <Code curCode="83057920148377721035" packLayer="1" parentCode="87069090015931993545" flag="0"/>-->
+ </Batch>
+ </Relation>
+ </Event>
+ </Events>
</DataList>
\ No newline at end of file
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index ecce9ae..bf46865 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -143,10 +143,14 @@
var newPalletInfo = await Db.Queryable<SysPallets>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Status == "0");
if (newPalletInfo == null)
{
- var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew &&(m.SkuNo != stockDetail.SkuNo || m.LotNo != stockDetail.LotNo)).ToList();
+ throw Oops.Bah("鏂版墭鐩樹俊鎭笉瀛樺湪锛�");
+ }
+ if (newPalletInfo.Status == "0")
+ {
+ var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && (m.SkuNo != stockDetail.SkuNo || m.LotNo != stockDetail.LotNo)).ToList();
if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
{
- throw Oops.Bah("鏂版墭鐩樹俊鎭笉瀛樺湪鎴栧凡琚娇鐢紒");
+ throw Oops.Bah("涓�涓墭鐩樺彧鑳芥帴鍙椾竴涓嚭搴撳崟鎷兼墭锛�");
}
}
else
--
Gitblit v1.8.0