From b2fc93e15a14847141b0a0a8bd591b945c9fa0a3 Mon Sep 17 00:00:00 2001
From: test <15284381150@163.com>
Date: 星期四, 21 八月 2025 18:44:34 +0800
Subject: [PATCH] 添加赋码实体类和修改箱码方法，改正拣货拼托
---
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 16
Wms/Model/InterFaceModel/HttpModel.cs | 1957 ++++++++++++++++++++++++++++-------------------------
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 129 +++
3 files changed, 1,175 insertions(+), 927 deletions(-)
diff --git a/Wms/Model/InterFaceModel/HttpModel.cs b/Wms/Model/InterFaceModel/HttpModel.cs
index 078b54a..ebe1a0a 100644
--- a/Wms/Model/InterFaceModel/HttpModel.cs
+++ b/Wms/Model/InterFaceModel/HttpModel.cs
@@ -1,953 +1,1074 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Text;
+锘� using System;
+ using System.Collections.Generic;
+ using System.ComponentModel;
+ using System.Text;
-namespace Model.InterFaceModel
-{
- /// <summary>
- /// 澶栭儴鎺ュ彛/鍓嶇杩斿洖鍙傛暟
- /// </summary>
- public class HttpReturnModel
+ namespace Model.InterFaceModel
{
/// <summary>
- /// 鐘舵�佺爜 0 鎴愬姛 -1澶辫触
+ /// 澶栭儴鎺ュ彛/鍓嶇杩斿洖鍙傛暟
/// </summary>
- public string Success { get; set; }
+ public class HttpReturnModel
+ {
+ /// <summary>
+ /// 鐘舵�佺爜 0 鎴愬姛 -1澶辫触
+ /// </summary>
+ public string Success { get; set; }
- /// <summary>
- /// 娑堟伅鎻愮ず
- /// </summary>
- public string Message { get; set; }
+ /// <summary>
+ /// 娑堟伅鎻愮ず
+ /// </summary>
+ public string Message { get; set; }
- public object Data { get; set; }
- }
+ public object Data { get; set; }
+ }
- #region ERP鎺ュ彛瀹炰綋绫�
- /// <summary>
- /// 鍙戦�佹帴鏀秂rp鎺ュ彛鍙傛暟鐨刴odel
- /// </summary>
- public class ErpModel
- {
+ #region ERP鎺ュ彛瀹炰綋绫�
/// <summary>
- /// 鐘舵�佺爜 0 鎴愬姛 -1澶辫触
+ /// 鍙戦�佹帴鏀秂rp鎺ュ彛鍙傛暟鐨刴odel
/// </summary>
- public int Success { get; set; }
- /// <summary>
- /// 淇℃伅璇︽儏
- /// </summary>
- public string Message { get; set; }
- }
+ public class ErpModel
+ {
+ /// <summary>
+ /// 鐘舵�佺爜 0 鎴愬姛 -1澶辫触
+ /// </summary>
+ public int Success { get; set; }
+ /// <summary>
+ /// 淇℃伅璇︽儏
+ /// </summary>
+ public string Message { get; set; }
+ }
- public class SendQcNoModel
- {
- // 閲囪喘鍗曞彿
- public string OrderNo { get; set; }
- /// <summary>
- /// 璇烽獙鍙�
- /// </summary>
- public string QcNo { get; set; }
+ public class SendQcNoModel
+ {
+ // 閲囪喘鍗曞彿
+ public string OrderNo { get; set; }
+ /// <summary>
+ /// 璇烽獙鍙�
+ /// </summary>
+ public string QcNo { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- public string SkuNo { get; set; }
- /// <summary>
- /// 鑷湁鎵规
- /// </summary>
- public string LotNo { get; set; }
- /// <summary>
- /// 渚涜揣鎵规
- /// </summary>
- public string SupplierLot { get; set; }
- /// <summary>
- /// 娑堣�楁暟閲�
- /// </summary>
- public string CompleteQty { get; set; }
- /// <summary>
- /// 鍙栨牱瀹屾垚鏃ユ湡-鎬诲崟UpdateTime
- /// </summary>
- public string CompleteTime { get; set; }
- }
- #endregion
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string SkuNo { get; set; }
+ /// <summary>
+ /// 鑷湁鎵规
+ /// </summary>
+ public string LotNo { get; set; }
+ /// <summary>
+ /// 渚涜揣鎵规
+ /// </summary>
+ public string SupplierLot { get; set; }
+ /// <summary>
+ /// 娑堣�楁暟閲�
+ /// </summary>
+ public string CompleteQty { get; set; }
+ /// <summary>
+ /// 鍙栨牱瀹屾垚鏃ユ湡-鎬诲崟UpdateTime
+ /// </summary>
+ public string CompleteTime { get; set; }
+ }
+ #endregion
- #region WCS鎺ュ彛瀹炰綋绫�
- /// <summary>
- /// 鎺ユ敹wcs鎺ュ彛杩斿洖WCS缁撴灉鍙傛暟鐨刴odel
- /// </summary>
- public class WcsModel
- {
- public int StatusCode { get; set; }
- public string Msg { get; set; }
- }
- /// <summary>
- /// 鎺ュ彈WCS鍙嶉鐨勫弬鏁�
- /// </summary>
- public class WcsModel2
- {
- public int code { get; set; }
- public string message { get; set; }
+ #region WCS鎺ュ彛瀹炰綋绫�
+ /// <summary>
+ /// 鎺ユ敹wcs鎺ュ彛杩斿洖WCS缁撴灉鍙傛暟鐨刴odel
+ /// </summary>
+ public class WcsModel
+ {
+ public int StatusCode { get; set; }
+ public string Msg { get; set; }
+ }
+ /// <summary>
+ /// 鎺ュ彈WCS鍙嶉鐨勫弬鏁�
+ /// </summary>
+ public class WcsModel2
+ {
+ public int code { get; set; }
+ public string message { get; set; }
- }
+ }
- public enum PLCTypeEnum
- {
+ public enum PLCTypeEnum
+ {
+
+ /// <summary>
+ /// 杈撻�佺嚎
+ /// </summary>
+ [Description("杈撻�佺嚎")]
+ ConveyorLine = 1,
+ /// <summary>
+ /// AGV灏忚溅
+ /// </summary>
+ [Description("AGV灏忚溅")]
+ AGV = 2,
+ /// <summary>
+ /// 绌挎杞�
+ /// </summary>
+ [Description("绌挎杞�")]
+ ShuttleCar = 7
+ }
/// <summary>
- /// 杈撻�佺嚎
+ /// Wms涓撶敤 涓嬪彂鎸囦护Dto
/// </summary>
- [Description("杈撻�佺嚎")]
- ConveyorLine = 1,
- /// <summary>
- /// AGV灏忚溅
- /// </summary>
- [Description("AGV灏忚溅")]
- AGV = 2,
- /// <summary>
- /// 绌挎杞�
- /// </summary>
- [Description("绌挎杞�")]
- ShuttleCar = 7
- }
+ public class OutCommandDto
+ {
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ public string TaskNo { get; set; }
- /// <summary>
- /// Wms涓撶敤 涓嬪彂鎸囦护Dto
- /// </summary>
- public class OutCommandDto
- {
- /// <summary>
- /// 浠诲姟鍙�
- /// </summary>
- public string TaskNo { get; set; }
+ /// <summary>
+ /// 浠诲姟绫诲瀷0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2绉诲簱浠诲姟
+ /// </summary>
+ public string TaskType { get; set; }
- /// <summary>
- /// 浠诲姟绫诲瀷0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2绉诲簱浠诲姟
- /// </summary>
- public string TaskType { get; set; }
+ public PLCTypeEnum Type { get; set; }
- public PLCTypeEnum Type { get; set; }
+ /// <summary>
+ /// 鎵樼洏鍙�
+ /// </summary>
+ public string PalletNo { get; set; }
- /// <summary>
- /// 鎵樼洏鍙�
- /// </summary>
- public string PalletNo { get; set; }
+ /// <summary>
+ /// 璧峰浣嶇疆
+ /// </summary>
+ public string StartLocate { get; set; }
- /// <summary>
- /// 璧峰浣嶇疆
- /// </summary>
- public string StartLocate { get; set; }
+ /// <summary>
+ /// 璧峰宸烽亾
+ /// </summary>
+ public string StartRoadway { get; set; }
- /// <summary>
- /// 璧峰宸烽亾
- /// </summary>
- public string StartRoadway { get; set; }
+ /// <summary>
+ /// 缁撴潫浣嶇疆
+ /// </summary>
+ public string EndLocate { get; set; }
- /// <summary>
- /// 缁撴潫浣嶇疆
- /// </summary>
- public string EndLocate { get; set; }
+ /// <summary>
+ /// 鐩爣宸烽亾
+ /// </summary>
+ public string EndRoadway { get; set; }
- /// <summary>
- /// 鐩爣宸烽亾
- /// </summary>
- public string EndRoadway { get; set; }
+ /// <summary>
+ /// 鍑哄簱鍙�
+ /// </summary>
+ public string OutMode { get; set; }
- /// <summary>
- /// 鍑哄簱鍙�
- /// </summary>
- public string OutMode { get; set; }
+ /// <summary>
+ /// 椤哄簭-浼樺厛绾�
+ /// </summary>
+ public int Order { get; set; }
+ public int? Qty { get; set; }
+ }
/// <summary>
- /// 椤哄簭-浼樺厛绾�
+ /// 鎺ュ彈wcs浠诲姟鍙嶉淇℃伅Model
/// </summary>
- public int Order { get; set; }
- public int? Qty { get; set; }
+ public class ReceiveWcsSignal
+ {
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ public string TaskNo { get; set; }
+ /// <summary>
+ /// 鎵樼洏鍙�
+ /// </summary>
+ public string PalletNo { get; set; }
+ /// <summary>
+ /// //2锛屼换鍔″畬鎴愶紝3锛屽彇娑堬紝
+ /// </summary>
+ public string TaskStatus { get; set; }
+ /// <summary>
+ /// 0:鍏ュ簱銆�1:鍑哄簱銆�2:绉诲簱
+ /// </summary>
+ public string TaskType { get; set; }
- }
- /// <summary>
- /// 鎺ュ彈wcs浠诲姟鍙嶉淇℃伅Model
- /// </summary>
- public class ReceiveWcsSignal
- {
- /// <summary>
- /// 浠诲姟鍙�
- /// </summary>
- public string TaskNo { get; set; }
- /// <summary>
- /// 鎵樼洏鍙�
- /// </summary>
- public string PalletNo { get; set; }
- /// <summary>
- /// //2锛屼换鍔″畬鎴愶紝3锛屽彇娑堬紝
- /// </summary>
- public string TaskStatus { get; set; }
- /// <summary>
- /// 0:鍏ュ簱銆�1:鍑哄簱銆�2:绉诲簱
- /// </summary>
- public string TaskType { get; set; }
-
- }
+ }
- //鎴愬搧鐮佸灈淇℃伅
- public class BoxPalletBindVm
- {
- /// <summary>
- /// 鐢熶骇宸ュ崟
- /// </summary>
- public string OrderCode { get; set; }
- /// <summary>
- /// 鍏ュ簱鍗曞彿
- /// </summary>
- public string AsnNo { get; set; }
- /// <summary>
- /// 鍏ュ簱鍗曟槑缁�
- /// </summary>
- public int? AsnDetailNo { get; set; }
- /// <summary>
- /// 鎵樼洏鍙�
- /// </summary>
- public string PalletNo { get; set; }
- /// <summary>
- /// 鎵樼洏鏁伴噺
- /// </summary>
- public decimal Qty { get; set; }
- /// <summary>
- /// 鎵樼洏绫诲瀷 0鐗╂枡鎵� 1绌烘墭鐩樻墭
- /// </summary>
- public string Type { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- public string SkuNo { get; set; }
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- public string LotNo { get; set; }
- /// <summary>
- /// 鎵规鎻忚堪
- /// </summary>
- public string LotText { get; set; }
- /// <summary>
- /// 渚涜揣鎵规
- /// </summary>
- public string SupplierLot { get; set; }
- public List<BoxPalletBindDetailVm> Detail { get; set; }
- }
- //鐮佸灈绠辩爜鏄庣粏淇℃伅
- public class BoxPalletBindDetailVm
- {
- /// <summary>
- /// 鐢熶骇鍗曟嵁鍙�
- /// </summary>
- public string OrderCode { get; set; }
- /// <summary>
- /// 绠卞彿
- /// </summary>
- public string BoxNo { get; set; }
- /// <summary>
- /// 鐩掑彿
- /// </summary>
- public string BoxNo2 { get; set; }
- /// <summary>
- /// 鏀彿
- /// </summary>
- public string BoxNo3 { get; set; }
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- public decimal Qty { get; set; }
- /// <summary>
- /// 婊＄鏁伴噺
- /// </summary>
- public decimal FullQty { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- public string SkuNo { get; set; }
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string SkuName { get; set; }
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- public string LotNo { get; set; }
- /// <summary>
- /// 鎵规鎻忚堪
- /// </summary>
- public string LotText { get; set; }
- /// <summary>
- /// 鐢熶骇鏃ユ湡
- /// </summary>
- public DateTime? ProductionTime { get; set; }
- /// <summary>
- /// 杩囨湡鏃堕棿
- /// </summary>
- public DateTime? ExpirationTime { get; set; }
- /// <summary>
- /// 妫�楠屾爣璁�
- /// </summary>
- public string InspectMark { get; set; }
- /// <summary>
- /// 闆剁鏍囪
- /// </summary>
- public string BitBoxMark { get; set; }
- /// <summary>
- /// 璐ㄦ鐘舵��
- /// </summary>
- public string InspectStatus { get; set; }
- /// <summary>
- /// 鐗╂枡瑙勬牸
- /// </summary>
- public string Standard { get; set; }
- /// <summary>
- /// 鍖呰瑙勬牸
- /// </summary>
- public string PackageStandard { get; set; }
- /// <summary>
- /// 鍌ㄥ瓨鏈熻嚦
- /// </summary>
- public DateTime? StoreTime { get; set; }
- /// <summary>
- /// 绗嚑浠�
- /// </summary>
- public int? QtyOrd { get; set; }
- /// <summary>
- /// 鎬讳欢鏁�
- /// </summary>
- public int? QtyCount { get; set; }
+ //鎴愬搧鐮佸灈淇℃伅
+ public class BoxPalletBindVm
+ {
+ /// <summary>
+ /// 鐢熶骇宸ュ崟
+ /// </summary>
+ public string OrderCode { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鍗曞彿
+ /// </summary>
+ public string AsnNo { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鍗曟槑缁�
+ /// </summary>
+ public int? AsnDetailNo { get; set; }
+ /// <summary>
+ /// 鎵樼洏鍙�
+ /// </summary>
+ public string PalletNo { get; set; }
+ /// <summary>
+ /// 鎵樼洏鏁伴噺
+ /// </summary>
+ public decimal Qty { get; set; }
+ /// <summary>
+ /// 鎵樼洏绫诲瀷 0鐗╂枡鎵� 1绌烘墭鐩樻墭
+ /// </summary>
+ public string Type { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string SkuNo { get; set; }
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ public string LotNo { get; set; }
+ /// <summary>
+ /// 鎵规鎻忚堪
+ /// </summary>
+ public string LotText { get; set; }
+ /// <summary>
+ /// 渚涜揣鎵规
+ /// </summary>
+ public string SupplierLot { get; set; }
+ public List<BoxPalletBindDetailVm> Detail { get; set; }
+ }
+ //鐮佸灈绠辩爜鏄庣粏淇℃伅
+ public class BoxPalletBindDetailVm
+ {
+ /// <summary>
+ /// 鐢熶骇鍗曟嵁鍙�
+ /// </summary>
+ public string OrderCode { get; set; }
+ /// <summary>
+ /// 绠卞彿
+ /// </summary>
+ public string BoxNo { get; set; }
+ /// <summary>
+ /// 鐩掑彿
+ /// </summary>
+ public string BoxNo2 { get; set; }
+ /// <summary>
+ /// 鏀彿
+ /// </summary>
+ public string BoxNo3 { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public decimal Qty { get; set; }
+ /// <summary>
+ /// 婊＄鏁伴噺
+ /// </summary>
+ public decimal FullQty { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string SkuNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string SkuName { get; set; }
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ public string LotNo { get; set; }
+ /// <summary>
+ /// 鎵规鎻忚堪
+ /// </summary>
+ public string LotText { get; set; }
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡
+ /// </summary>
+ public DateTime? ProductionTime { get; set; }
+ /// <summary>
+ /// 杩囨湡鏃堕棿
+ /// </summary>
+ public DateTime? ExpirationTime { get; set; }
+ /// <summary>
+ /// 妫�楠屾爣璁�
+ /// </summary>
+ public string InspectMark { get; set; }
+ /// <summary>
+ /// 闆剁鏍囪
+ /// </summary>
+ public string BitBoxMark { get; set; }
+ /// <summary>
+ /// 璐ㄦ鐘舵��
+ /// </summary>
+ public string InspectStatus { get; set; }
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ public string Standard { get; set; }
+ /// <summary>
+ /// 鍖呰瑙勬牸
+ /// </summary>
+ public string PackageStandard { get; set; }
+ /// <summary>
+ /// 鍌ㄥ瓨鏈熻嚦
+ /// </summary>
+ public DateTime? StoreTime { get; set; }
+ /// <summary>
+ /// 绗嚑浠�
+ /// </summary>
+ public int? QtyOrd { get; set; }
+ /// <summary>
+ /// 鎬讳欢鏁�
+ /// </summary>
+ public int? QtyCount { get; set; }
+ }
+
+
+ #endregion
+
+
+ #region Limes鎺ュ彛瀹炰綋绫�
+ /// <summary>
+ /// Limes鎺ュ彛杩斿洖瀹炰綋
+ /// </summary>
+ public class LimesModel
+ {
+ /// <summary>
+ /// 鐘舵�佺爜 0 鎴愬姛 -1澶辫触
+ /// </summary>
+ public int Success { get; set; }
+ /// <summary>
+ /// 淇℃伅璇︽儏
+ /// </summary>
+ public string Message { get; set; }
+
+ /// <summary>
+ /// 鍙栨牱閲�
+ /// </summary>
+ public string SamplingQty { get; set; }
+ }
+
+ /// <summary>
+ /// 璋冪敤Limes鎺ュ彛
+ /// </summary>
+ public class SendLimesModel
+ {
+ public string QcNo { get; set; }
+ public string SkuNo { get; set; }
+ public string Qty { get; set; }
+ public string LotNo { get; set; }
+ public string SupplierLot { get; set; }
+ public string RequestUser { get; set; }
+ }
+ #endregion
+
+
+ #region MyRegion
+
+ public class FumaGetBoxModel
+ {
+ public string Success { get; set; }
+ public string Message { get; set; }
+ public PlnBoxModel Product { get; set; }
+ }
+
+ public class PlnBoxModel
+ {
+
+ /// <summary>
+ /// 涓婃父鍗曟嵁鍙�
+ /// </summary>
+ public string OrderNo { get; set; }
+ /// <summary>
+ /// 鎵樼洏鍙�
+ /// </summary>
+ public string PallNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍙�
+ /// </summary>
+ public string SkuNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string SkuName { get; set; }
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ public string LotNo { get; set; }
+ /// <summary>
+ /// 鎵规鎻忚堪
+ /// </summary>
+ public string LotText { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗕唬鐮�
+ /// </summary>
+ public string Custom { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗗悕绉�
+ /// </summary>
+ public string CustomName { get; set; }
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡
+ /// </summary>
+ public string ProductionTime { get; set; }
+ /// <summary>
+ /// 杩囨湡鏃ユ湡
+ /// </summary>
+ public string ExpirationTime { get; set; }
+ /// <summary>
+ /// 浜х嚎
+ /// </summary>
+ public string Line_No { get; set; }
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ public string Standard { get; set; }
+ /// <summary>
+ /// 鍖呰瑙勬牸
+ /// </summary>
+ public string PackageStandard { get; set; }
+ /// <summary>
+ /// 鍖呰鍗曚綅
+ /// </summary>
+ public string PackUnit { get; set; }
+ /// <summary>
+ /// 瀛樺偍鏈熻嚦
+ /// </summary>
+ public string StoreTime { get; set; }
+
+ /// <summary>
+ /// 绠辩爜淇℃伅
+ /// </summary>
+ public List<BoxInfoList> BoxInfoList { get; set; }
+ }
+
+ public class BoxInfoList
+ {
+ /// <summary>
+ /// 闆剁鏍囪
+ /// </summary>
+ public string BitBoxMark { get; set; }
+ /// <summary>
+ /// 绠辨潯鐮�
+ /// </summary>
+ public string BoxNo { get; set; }
+
+ /// <summary>
+ /// 鐩掔爜淇℃伅
+ /// </summary>
+ public List<BoxInfo2List> BoxInfo2List { get; set; }
+ }
+ public class BoxInfo2List
+ {
+ /// <summary>
+ /// 鐩掓潯鐮�
+ /// </summary>
+ public string BoxNo2 { get; set; }
+
+ /// <summary>
+ /// 鏀爜淇℃伅
+ /// </summary>
+ public List<BoxInfo3List> BoxInfo3List { get; set; }
+ }
+
+ public class BoxInfo3List
+ {
+ /// <summary>
+ /// 鏀潯鐮�
+ /// </summary>
+ public string BoxNo3 { get; set; }
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public decimal Qty { get; set; }
+ }
+
+ #endregion
+
+ #region 璧嬬爜瀹炰綋绫�
+ public class FuMaPostModel
+ {
+ /// <summary>
+ /// 鎿嶄綔鏄惁鎴愬姛
+ /// </summary>
+ public bool Success { get; set; }
+
+ /// <summary>
+ /// 娑堟伅鎻愮ず
+ /// </summary>
+ public string Message { get; set; }
+
+ /// <summary>
+ /// 鏍稿績鏁版嵁
+ /// </summary>
+ public FuMaOneModel Data { get; set; }
+ }
+ public class FuMaOneModel
+ {
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string SkuNo { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string SkuName { get; set; }
+
+ /// <summary>
+ /// 瑙勬牸
+ /// </summary>
+ public string Standard { get; set; }
+
+ /// <summary>
+ /// 绠辩爜锛堜竴绾х鐮侊級
+ /// </summary>
+ public string BoxNo { get; set; }
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public decimal Qty { get; set; }
+
+ /// <summary>
+ /// 婊＄鏁伴噺
+ /// </summary>
+ public string FullQty { get; set; }
+
+ /// <summary>
+ /// 缁撴潫鎵规鍙�
+ /// </summary>
+ public string EndLotNo { get; set; }
+
+ /// <summary>
+ /// 鎵规绠辨暟
+ /// </summary>
+ public string LotNoBoxNum { get; set; }
+
+ /// <summary>
+ /// 妫�楠屾爣璇嗭紙0锛氭湭妫�楠岋紝1锛氬凡妫�楠岀瓑锛�
+ /// </summary>
+ public string InsPectMark { get; set; }
+
+ /// <summary>
+ /// 绠辩爜鏍囪瘑锛�0锛氭甯革紝1锛氱壒娈婄瓑锛�
+ /// </summary>
+ public string BitBoxMark { get; set; }
+
+ /// <summary>
+ /// 妫�楠岀姸鎬�
+ /// </summary>
+ public string InspectStatus { get; set; }
+
+ /// <summary>
+ /// 鏉ユ簮
+ /// </summary>
+ public string Origin { get; set; }
+
+ /// <summary>
+ /// 浜岀骇绠辩爜鍒楄〃
+ /// </summary>
+ public List<FuMaTwoModel> DetailList { get; set; }
+ }
+ public class FuMaTwoModel
+ {
+ /// <summary>
+ /// 浜岀骇绠辩爜缂栧彿
+ /// </summary>
+ public string BoxNo2 { get; set; }
+
+ /// <summary>
+ /// 涓夌骇绠辩爜鍒楄〃
+ /// </summary>zl
+ public List<FuMaThreeModel> DetailList2 { get; set; }
+ }
+ public class FuMaThreeModel
+ {
+ /// <summary>
+ /// 涓夌骇绠辩爜缂栧彿
+ /// </summary>
+ public string BoxNo3 { get; set; }
+
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ public string LotNo { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡
+ /// </summary>
+ public string ProductionTime { get; set; } // 鑻ラ渶 DateTime 绫诲瀷锛屽彲鍚庣画杞崲
+
+ /// <summary>
+ /// 杩囨湡鏃堕棿
+ /// </summary>
+ public string ExpirationTime { get; set; } // 鑻ラ渶 DateTime 绫诲瀷锛屽彲鍚庣画杞崲
+ }
+ #endregion
+
+ #region #SAP瀹炰綋绫�
+ public class SapSkuInfoVm
+ {
+ public SendSkuInfoVm data { get; set; }
+ }
+ public class SendSkuInfoVm
+ {
+ /// <summary>
+ /// 鐗╂枡鍙�
+ /// </summary>
+ public long skuNo { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string skuName { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫荤洰
+ /// </summary>
+ public string categoryNo { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫荤洰鍚嶇О
+ /// </summary>
+ public string categoryName { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡瀛樻斁鍖哄煙
+ /// </summary>
+ public string regionNo { get; set; }
+
+ /// <summary>
+ /// 鏄惁鍏嶆
+ /// </summary>
+ public int consume { get; set; }
+
+ /// <summary>
+ /// 鍩烘湰鍗曚綅
+ /// </summary>
+ public string unit { get; set; }
+
+ /// <summary>
+ /// 鍖呰鏁伴噺
+ /// </summary>
+ public decimal packageQty { get; set; }
+
+ /// <summary>
+ /// 绠卞崟浣�
+ /// </summary>
+ public string packageName { get; set; }
+
+ /// <summary>
+ /// 瑙勬牸
+ /// </summary>
+ public string specification { get; set; }
+
+ /// <summary>
+ /// 淇濊川鏈�
+ /// </summary>
+ public string? shelfLife { get; set; }
+
+ /// <summary>
+ /// 鍑哄簱涓存湡澶╂暟
+ /// </summary>
+ public string? remainingDays { get; set; }
+ }
+
+ public class SapCustomerVm
+ {
+ public SendCustomerVm data { get; set; }
+ }
+ /// <summary>
+ /// 涓嬪彂鍚屾瀹㈡埛渚涘簲鍟嗘暟鎹�
+ /// </summary>
+ public class SendCustomerVm
+ {
+ /// <summary>
+ /// 缂栧彿
+ /// </summary>
+ public long customerNo { get; set; }
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string customerName { get; set; }
+ /// <summary>
+ /// 绫诲瀷 0锛氬鎴枫��1锛氫緵搴斿晢銆�
+ /// </summary>
+ public string CustomerType { get; set; }
+ /// <summary>
+ /// 鍦板潃
+ /// </summary>
+ public string streetAddress { get; set; }
+ /// <summary>
+ /// 鑱旂郴浜�
+ /// </summary>
+ public string contact { get; set; }
+ /// <summary>
+ /// 鑱旂郴浜虹數璇�
+ /// </summary>
+ public string contactMobile { get; set; }
+ }
+
+ public class SapAsnVm
+ {
+ /// <summary>
+ /// 鎿嶄綔浜�
+ /// </summary>
+ public string @operator{ get; set; }
+ public SendAsnVm data { get; set; }
+ }
+ public class SendAsnVm
+ {
+ /// <summary>
+ /// 鍏ュ簱鍗曞彿
+ /// </summary>
+ public string orderNo { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鍗曠被鍨�
+ /// 0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 3锛氶��璐у叆搴� 锛堥攢鍞��璐э級4锛氫綑鏂欓��鍥炲叆搴� 8 锛氱敓浜ч��鏂欏叆搴�
+ /// </summary>
+ public string billType { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗙紪鍙�
+ /// </summary>
+ public string vendorNo { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗗悕绉�
+ /// </summary>
+ public string vendorName { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鍗曟槑缁嗗垪琛�
+ /// </summary>
+ public List<SendAsnDetail> orderDCmdList { get; set; }
+ }
+ public class SendAsnDetail
+ {
+ /// <summary>
+ /// 鍏ュ簱鍗曡鍙�
+ /// </summary>
+ public string lineNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string skuNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string skuName { get; set; }
+ /// <summary>
+ /// 搴旀敹鐗╂枡鏁伴噺
+ /// </summary>
+ public string expectedQty { get; set; }
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ public string lotNo { get; set; }
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡
+ /// </summary>
+ public string productionDate { get; set; }
+ /// <summary>
+ /// 鍒版湡鏃ユ湡
+ /// </summary>
+ public string expireDate { get; set; }
+ /// <summary>
+ /// 澶嶆鏃ユ湡
+ /// </summary>
+ public string retestDate { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗘壒鍙�
+ /// </summary>
+ public string supplyBatch { get; set; }
+ }
+
+ public class SapSoVm
+ {
+ /// <summary>
+ /// 鎿嶄綔浜�
+ /// </summary>
+ public string @operator { get; set; }
+ public SendSoVm data { get; set; }
+ }
+ public class SendSoVm
+ {
+ /// <summary>
+ /// 鍑哄簱鍗曞彿
+ /// </summary>
+ public string orderNo { get; set; }
+ /// <summary>
+ /// 鍑哄簱鍗曟嵁绫诲瀷
+ /// 0锛氭垚鍝佸嚭搴撱��1锛氶鏂欏嚭搴撱��4锛氫笉鍚堟牸鍝佸嚭搴撱��7锛氬叾浠栧嚭搴� 銆�9 锛氱敓浜ч鏂欏嚭搴�
+ /// </summary>
+ public string orderType { get; set; }
+ /// <summary>
+ /// 瀹㈡埛缂栫爜
+ /// </summary>
+ public string customerNo { get; set; }
+ /// <summary>
+ /// 瀹㈡埛鍚嶇О
+ /// </summary>
+ public string customerName { get; set; }
+ /// <summary>
+ /// 鍑哄簱鍗曟槑缁嗗垪琛�
+ /// </summary>
+ public List<SendSoDetail> orderDetailList { get; set; }
+ }
+ public class SendSoDetail
+ {
+ /// <summary>
+ /// 鍙戝嚭浠撳簱
+ /// </summary>
+ public string wareHouseNo { get; set; }
+ /// <summary>
+ /// 鍑哄簱鍗曡鍙�
+ /// </summary>
+ public string lineNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string skuNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string skuName { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public decimal skuQty { get; set; }
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ public string lotNo { get; set; }
+ }
+
+ public class BackAsnVm
+ {
+ /// <summary>
+ /// 闃查噸鐮�
+ /// </summary>
+ public string ZUUID { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鍗曞彿
+ /// </summary>
+ public string VBELN { get; set; }
+ /// <summary>
+ /// 璁㈠崟绫诲瀷锛�0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 3锛氶��璐у叆搴� 4锛氫綑鏂欓��鍥炲叆搴� 8 锛氱敓浜ч��鏂欏叆搴�
+ /// </summary>
+ public string LFART { get; set; }
+ /// <summary>
+ /// 鍏ュ簱瀹屾垚鏃堕棿
+ /// </summary>
+ public string WADAT_IST { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鍗曟槑缁嗗垪琛�
+ /// </summary>
+ public List<BackAsnDetail> ITEM { get; set; }
+ }
+ public class BackAsnDetail
+ {
+ /// <summary>
+ /// 琛岀紪鐮�
+ /// </summary>
+ public string POSNR { get; set; }
+ /// <summary>
+ /// 鑽搧缂栫爜
+ /// </summary>
+ public string MATNR { get; set; }
+ /// <summary>
+ /// 鑽搧鍚嶇О
+ /// </summary>
+ public string MAKTX { get; set; }
+ /// <summary>
+ /// 瀹炴敹鏁伴噺
+ /// </summary>
+ public string LFIMG { get; set; }
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ public string MEINS { get; set; }
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ public string CHARG { get; set; }
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡
+ /// </summary>
+ public string HSDAT { get; set; }
+ /// <summary>
+ /// 鍒版湡鏃ユ湡
+ /// </summary>
+ public string VFDAT { get; set; }
+ }
+
+ public class BackSoVm
+ {
+ /// <summary>
+ /// 闃查噸鐮�
+ /// </summary>
+ public string ZUUID { get; set; }
+ /// <summary>
+ /// 鍑哄簱鍗曞彿
+ /// </summary>
+ public string VBELN { get; set; }
+ /// <summary>
+ /// 璐т富缂栫爜
+ /// </summary>
+ public string WERKS { get; set; }
+ /// <summary>
+ /// 鍑哄簱鍗曠被鍨�,鍗曟嵁绫诲瀷 0锛氭垚鍝佸嚭搴� 1锛氶鏂欏嚭搴� 4锛氫笉鍚堟牸鍝佸嚭搴� 7锛氬叾浠栧嚭搴� 9 锛氱敓浜ч鏂欏嚭搴�
+ /// </summary>
+ public string LFART { get; set; }
+ /// <summary>
+ /// 璁㈠崟瀹屾垚鏃堕棿
+ /// </summary>
+ public string WADAT_IST { get; set; }
+ /// <summary>
+ /// 璁㈠崟鏄庣粏
+ /// </summary>
+ public List<BackSoDetail> ITEM { get; set; }
+ }
+ public class BackSoDetail
+ {
+ /// <summary>
+ /// 琛屽彿
+ /// </summary>
+ public string POSNR { get; set; }
+ /// <summary>
+ /// 鑽搧缂栫爜
+ /// </summary>
+ public string MATNR { get; set; }
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ public string CHARG { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public string LFIMG { get; set; }
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ public string MEINS { get; set; }
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡
+ /// </summary>
+ public string HSDAT { get; set; }
+ /// <summary>
+ /// 鍒版湡鏃ユ湡
+ /// </summary>
+ public string VFDAT { get; set; }
+ }
+
+ public class SapQualityVm
+ {
+ public string @operator{ get; set; }
+ public SendQualityVm data { get; set; }
+ }
+ public class SendQualityVm
+ {
+ /// <summary>
+ /// 璋冩暣鍗曞彿
+ /// </summary>
+ public string orderNo { get; set; }
+ /// <summary>
+ /// 璋冩暣鍗曟槑缁嗗垪琛�
+ /// </summary>
+ public List<SendQualityDetailVm> adjustmentDList { get; set; }
+ }
+ public class SendQualityDetailVm
+ {
+ /// <summary>
+ /// 琛屽彿
+ /// </summary>
+ public string lineNo { get; set; }
+ /// <summary>
+ /// 璐т富缂栧彿
+ /// </summary>
+ public string ownerNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string skuNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string skuName { get; set; }
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ public string lotNo { get; set; }
+ /// <summary>
+ /// 璋冩暣鏁伴噺
+ /// </summary>
+ public decimal skuQty { get; set; }
+ /// <summary>
+ /// 鏄惁鍚堟牸
+ /// </summary>
+ public string IsQualified { get; set; }
+ }
+
+ public class SapSampleVm
+ {
+ public SendSampleVm data { get; set; }
+ }
+ public class SendSampleVm
+ {
+ public List<SendSampleSku> pallDataList { get; set; }
+ }
+ public class SendSampleSku
+ {
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string skuNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string skuName { get; set; }
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ public string lotNo { get; set; }
+ /// <summary>
+ /// 鎵ｉ櫎鏁伴噺
+ /// </summary>
+ public decimal skuQty { get; set; }
+ }
+
+
+ public class SapQcVm
+ {
+ public SendSapQcVm data { get; set; }
+ }
+ public class SendSapQcVm
+ {
+ public List<SendSapQcDetailVm> pallDataList { get; set; }
+ }
+ public class SendSapQcDetailVm
+ {
+ /// <summary>
+ /// 璇烽獙缂栧彿
+ /// </summary>
+ public string QcNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string skuNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string skuName { get; set; }
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ public string lotNo { get; set; }
+ /// <summary>
+ /// 鍒拌揣鏁伴噺
+ /// </summary>
+ public decimal Qty { get; set; }
+ /// <summary>
+ /// 渚涜揣鎵规
+ /// </summary>
+ public string SupplierLot { get; set; }
+ }
+ #endregion
}
-
-
- #endregion
-
-
- #region Limes鎺ュ彛瀹炰綋绫�
- /// <summary>
- /// Limes鎺ュ彛杩斿洖瀹炰綋
- /// </summary>
- public class LimesModel
- {
- /// <summary>
- /// 鐘舵�佺爜 0 鎴愬姛 -1澶辫触
- /// </summary>
- public int Success { get; set; }
- /// <summary>
- /// 淇℃伅璇︽儏
- /// </summary>
- public string Message { get; set; }
-
- /// <summary>
- /// 鍙栨牱閲�
- /// </summary>
- public string SamplingQty { get; set; }
- }
-
- /// <summary>
- /// 璋冪敤Limes鎺ュ彛
- /// </summary>
- public class SendLimesModel
- {
- public string QcNo { get; set; }
- public string SkuNo { get; set; }
- public string Qty { get; set; }
- public string LotNo { get; set; }
- public string SupplierLot { get; set; }
- public string RequestUser { get; set; }
- }
- #endregion
-
-
- #region MyRegion
-
- public class FumaGetBoxModel
- {
- public string Success { get; set; }
- public string Message { get; set; }
- public PlnBoxModel Product { get; set; }
- }
-
- public class PlnBoxModel
- {
-
- /// <summary>
- /// 涓婃父鍗曟嵁鍙�
- /// </summary>
- public string OrderNo { get; set; }
- /// <summary>
- /// 鎵樼洏鍙�
- /// </summary>
- public string PallNo { get; set; }
- /// <summary>
- /// 鐗╂枡鍙�
- /// </summary>
- public string SkuNo { get; set; }
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string SkuName { get; set; }
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- public string LotNo { get; set; }
- /// <summary>
- /// 鎵规鎻忚堪
- /// </summary>
- public string LotText { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗕唬鐮�
- /// </summary>
- public string Custom { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗗悕绉�
- /// </summary>
- public string CustomName { get; set; }
- /// <summary>
- /// 鐢熶骇鏃ユ湡
- /// </summary>
- public string ProductionTime { get; set; }
- /// <summary>
- /// 杩囨湡鏃ユ湡
- /// </summary>
- public string ExpirationTime { get; set; }
- /// <summary>
- /// 浜х嚎
- /// </summary>
- public string Line_No { get; set; }
- /// <summary>
- /// 鐗╂枡瑙勬牸
- /// </summary>
- public string Standard { get; set; }
- /// <summary>
- /// 鍖呰瑙勬牸
- /// </summary>
- public string PackageStandard { get; set; }
- /// <summary>
- /// 鍖呰鍗曚綅
- /// </summary>
- public string PackUnit { get; set; }
- /// <summary>
- /// 瀛樺偍鏈熻嚦
- /// </summary>
- public string StoreTime { get; set; }
-
- /// <summary>
- /// 绠辩爜淇℃伅
- /// </summary>
- public List<BoxInfoList> BoxInfoList { get; set; }
- }
-
- public class BoxInfoList
- {
- /// <summary>
- /// 闆剁鏍囪
- /// </summary>
- public string BitBoxMark { get; set; }
- /// <summary>
- /// 绠辨潯鐮�
- /// </summary>
- public string BoxNo { get; set; }
-
- /// <summary>
- /// 鐩掔爜淇℃伅
- /// </summary>
- public List<BoxInfo2List> BoxInfo2List { get; set; }
- }
- public class BoxInfo2List
- {
- /// <summary>
- /// 鐩掓潯鐮�
- /// </summary>
- public string BoxNo2 { get; set; }
-
- /// <summary>
- /// 鏀爜淇℃伅
- /// </summary>
- public List<BoxInfo3List> BoxInfo3List { get; set; }
- }
-
- public class BoxInfo3List
- {
- /// <summary>
- /// 鏀潯鐮�
- /// </summary>
- public string BoxNo3 { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- public decimal Qty { get; set; }
- }
-
- #endregion
-
- #region#SAP瀹炰綋绫�
- public class SapSkuInfoVm
- {
- public SendSkuInfoVm data { get; set; }
- }
- public class SendSkuInfoVm
- {
- /// <summary>
- /// 鐗╂枡鍙�
- /// </summary>
- public long skuNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string skuName { get; set; }
-
- /// <summary>
- /// 鐗╂枡绫荤洰
- /// </summary>
- public string categoryNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡绫荤洰鍚嶇О
- /// </summary>
- public string categoryName { get; set; }
-
- /// <summary>
- /// 鐗╂枡瀛樻斁鍖哄煙
- /// </summary>
- public string regionNo { get; set; }
-
- /// <summary>
- /// 鏄惁鍏嶆
- /// </summary>
- public int consume { get; set; }
-
- /// <summary>
- /// 鍩烘湰鍗曚綅
- /// </summary>
- public string unit { get; set; }
-
- /// <summary>
- /// 鍖呰鏁伴噺
- /// </summary>
- public decimal packageQty { get; set; }
-
- /// <summary>
- /// 绠卞崟浣�
- /// </summary>
- public string packageName { get; set; }
-
- /// <summary>
- /// 瑙勬牸
- /// </summary>
- public string specification { get; set; }
-
- /// <summary>
- /// 淇濊川鏈�
- /// </summary>
- public string? shelfLife { get; set; }
-
- /// <summary>
- /// 鍑哄簱涓存湡澶╂暟
- /// </summary>
- public string? remainingDays { get; set; }
- }
-
- public class SapCustomerVm
- {
- public SendCustomerVm data { get; set; }
- }
- /// <summary>
- /// 涓嬪彂鍚屾瀹㈡埛渚涘簲鍟嗘暟鎹�
- /// </summary>
- public class SendCustomerVm
- {
- /// <summary>
- /// 缂栧彿
- /// </summary>
- public long customerNo { get; set; }
- /// <summary>
- /// 鍚嶇О
- /// </summary>
- public string customerName { get; set; }
- /// <summary>
- /// 绫诲瀷 0锛氬鎴枫��1锛氫緵搴斿晢銆�
- /// </summary>
- public string CustomerType { get; set; }
- /// <summary>
- /// 鍦板潃
- /// </summary>
- public string streetAddress { get; set; }
- /// <summary>
- /// 鑱旂郴浜�
- /// </summary>
- public string contact { get; set; }
- /// <summary>
- /// 鑱旂郴浜虹數璇�
- /// </summary>
- public string contactMobile { get; set; }
- }
-
- public class SapAsnVm
- {
- /// <summary>
- /// 鎿嶄綔浜�
- /// </summary>
- public string @operator{ get; set; }
- public SendAsnVm data { get; set; }
- }
- public class SendAsnVm
- {
- /// <summary>
- /// 鍏ュ簱鍗曞彿
- /// </summary>
- public string orderNo { get; set; }
- /// <summary>
- /// 鍏ュ簱鍗曠被鍨�
- /// 0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 3锛氶��璐у叆搴� 锛堥攢鍞��璐э級4锛氫綑鏂欓��鍥炲叆搴� 8 锛氱敓浜ч��鏂欏叆搴�
- /// </summary>
- public string billType { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗙紪鍙�
- /// </summary>
- public string vendorNo { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗗悕绉�
- /// </summary>
- public string vendorName { get; set; }
- /// <summary>
- /// 鍏ュ簱鍗曟槑缁嗗垪琛�
- /// </summary>
- public List<SendAsnDetail> orderDCmdList { get; set; }
- }
- public class SendAsnDetail
- {
- /// <summary>
- /// 鍏ュ簱鍗曡鍙�
- /// </summary>
- public string lineNo { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- public string skuNo { get; set; }
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string skuName { get; set; }
- /// <summary>
- /// 搴旀敹鐗╂枡鏁伴噺
- /// </summary>
- public string expectedQty { get; set; }
- /// <summary>
- /// 鎵瑰彿
- /// </summary>
- public string lotNo { get; set; }
- /// <summary>
- /// 鐢熶骇鏃ユ湡
- /// </summary>
- public string productionDate { get; set; }
- /// <summary>
- /// 鍒版湡鏃ユ湡
- /// </summary>
- public string expireDate { get; set; }
- /// <summary>
- /// 澶嶆鏃ユ湡
- /// </summary>
- public string retestDate { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗘壒鍙�
- /// </summary>
- public string supplyBatch { get; set; }
- }
-
- public class SapSoVm
- {
- /// <summary>
- /// 鎿嶄綔浜�
- /// </summary>
- public string @operator { get; set; }
- public SendSoVm data { get; set; }
- }
- public class SendSoVm
- {
- /// <summary>
- /// 鍑哄簱鍗曞彿
- /// </summary>
- public string orderNo { get; set; }
- /// <summary>
- /// 鍑哄簱鍗曟嵁绫诲瀷
- /// 0锛氭垚鍝佸嚭搴撱��1锛氶鏂欏嚭搴撱��4锛氫笉鍚堟牸鍝佸嚭搴撱��7锛氬叾浠栧嚭搴� 銆�9 锛氱敓浜ч鏂欏嚭搴�
- /// </summary>
- public string orderType { get; set; }
- /// <summary>
- /// 瀹㈡埛缂栫爜
- /// </summary>
- public string customerNo { get; set; }
- /// <summary>
- /// 瀹㈡埛鍚嶇О
- /// </summary>
- public string customerName { get; set; }
- /// <summary>
- /// 鍑哄簱鍗曟槑缁嗗垪琛�
- /// </summary>
- public List<SendSoDetail> orderDetailList { get; set; }
- }
- public class SendSoDetail
- {
- /// <summary>
- /// 鍙戝嚭浠撳簱
- /// </summary>
- public string wareHouseNo { get; set; }
- /// <summary>
- /// 鍑哄簱鍗曡鍙�
- /// </summary>
- public string lineNo { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- public string skuNo { get; set; }
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string skuName { get; set; }
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- public decimal skuQty { get; set; }
- /// <summary>
- /// 鎵瑰彿
- /// </summary>
- public string lotNo { get; set; }
- }
-
- public class BackAsnVm
- {
- /// <summary>
- /// 闃查噸鐮�
- /// </summary>
- public string ZUUID { get; set; }
- /// <summary>
- /// 鍏ュ簱鍗曞彿
- /// </summary>
- public string VBELN { get; set; }
- /// <summary>
- /// 璁㈠崟绫诲瀷锛�0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 3锛氶��璐у叆搴� 4锛氫綑鏂欓��鍥炲叆搴� 8 锛氱敓浜ч��鏂欏叆搴�
- /// </summary>
- public string LFART { get; set; }
- /// <summary>
- /// 鍏ュ簱瀹屾垚鏃堕棿
- /// </summary>
- public string WADAT_IST { get; set; }
- /// <summary>
- /// 鍏ュ簱鍗曟槑缁嗗垪琛�
- /// </summary>
- public List<BackAsnDetail> ITEM { get; set; }
- }
- public class BackAsnDetail
- {
- /// <summary>
- /// 琛岀紪鐮�
- /// </summary>
- public string POSNR { get; set; }
- /// <summary>
- /// 鑽搧缂栫爜
- /// </summary>
- public string MATNR { get; set; }
- /// <summary>
- /// 鑽搧鍚嶇О
- /// </summary>
- public string MAKTX { get; set; }
- /// <summary>
- /// 瀹炴敹鏁伴噺
- /// </summary>
- public string LFIMG { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- public string MEINS { get; set; }
- /// <summary>
- /// 鎵瑰彿
- /// </summary>
- public string CHARG { get; set; }
- /// <summary>
- /// 鐢熶骇鏃ユ湡
- /// </summary>
- public string HSDAT { get; set; }
- /// <summary>
- /// 鍒版湡鏃ユ湡
- /// </summary>
- public string VFDAT { get; set; }
- }
-
- public class BackSoVm
- {
- /// <summary>
- /// 闃查噸鐮�
- /// </summary>
- public string ZUUID { get; set; }
- /// <summary>
- /// 鍑哄簱鍗曞彿
- /// </summary>
- public string VBELN { get; set; }
- /// <summary>
- /// 璐т富缂栫爜
- /// </summary>
- public string WERKS { get; set; }
- /// <summary>
- /// 鍑哄簱鍗曠被鍨�,鍗曟嵁绫诲瀷 0锛氭垚鍝佸嚭搴� 1锛氶鏂欏嚭搴� 4锛氫笉鍚堟牸鍝佸嚭搴� 7锛氬叾浠栧嚭搴� 9 锛氱敓浜ч鏂欏嚭搴�
- /// </summary>
- public string LFART { get; set; }
- /// <summary>
- /// 璁㈠崟瀹屾垚鏃堕棿
- /// </summary>
- public string WADAT_IST { get; set; }
- /// <summary>
- /// 璁㈠崟鏄庣粏
- /// </summary>
- public List<BackSoDetail> ITEM { get; set; }
- }
- public class BackSoDetail
- {
- /// <summary>
- /// 琛屽彿
- /// </summary>
- public string POSNR { get; set; }
- /// <summary>
- /// 鑽搧缂栫爜
- /// </summary>
- public string MATNR { get; set; }
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- public string CHARG { get; set; }
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- public string LFIMG { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- public string MEINS { get; set; }
- /// <summary>
- /// 鐢熶骇鏃ユ湡
- /// </summary>
- public string HSDAT { get; set; }
- /// <summary>
- /// 鍒版湡鏃ユ湡
- /// </summary>
- public string VFDAT { get; set; }
- }
-
- public class SapQualityVm
- {
- public string @operator{ get; set; }
- public SendQualityVm data { get; set; }
- }
- public class SendQualityVm
- {
- /// <summary>
- /// 璋冩暣鍗曞彿
- /// </summary>
- public string orderNo { get; set; }
- /// <summary>
- /// 璋冩暣鍗曟槑缁嗗垪琛�
- /// </summary>
- public List<SendQualityDetailVm> adjustmentDList { get; set; }
- }
- public class SendQualityDetailVm
- {
- /// <summary>
- /// 琛屽彿
- /// </summary>
- public string lineNo { get; set; }
- /// <summary>
- /// 璐т富缂栧彿
- /// </summary>
- public string ownerNo { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- public string skuNo { get; set; }
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string skuName { get; set; }
- /// <summary>
- /// 鎵瑰彿
- /// </summary>
- public string lotNo { get; set; }
- /// <summary>
- /// 璋冩暣鏁伴噺
- /// </summary>
- public decimal skuQty { get; set; }
- /// <summary>
- /// 鏄惁鍚堟牸
- /// </summary>
- public string IsQualified { get; set; }
- }
-
- public class SapSampleVm
- {
- public SendSampleVm data { get; set; }
- }
- public class SendSampleVm
- {
- public List<SendSampleSku> pallDataList { get; set; }
- }
- public class SendSampleSku
- {
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- public string skuNo { get; set; }
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string skuName { get; set; }
- /// <summary>
- /// 鎵瑰彿
- /// </summary>
- public string lotNo { get; set; }
- /// <summary>
- /// 鎵ｉ櫎鏁伴噺
- /// </summary>
- public decimal skuQty { get; set; }
- }
-
-
- public class SapQcVm
- {
- public SendSapQcVm data { get; set; }
- }
- public class SendSapQcVm
- {
- public List<SendSapQcDetailVm> pallDataList { get; set; }
- }
- public class SendSapQcDetailVm
- {
- /// <summary>
- /// 璇烽獙缂栧彿
- /// </summary>
- public string QcNo { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- public string skuNo { get; set; }
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string skuName { get; set; }
- /// <summary>
- /// 鎵瑰彿
- /// </summary>
- public string lotNo { get; set; }
- /// <summary>
- /// 鍒拌揣鏁伴噺
- /// </summary>
- public decimal Qty { get; set; }
- /// <summary>
- /// 渚涜揣鎵规
- /// </summary>
- public string SupplierLot { get; set; }
- }
- #endregion
-}
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 72de3a2..657aebb 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -30,6 +30,7 @@
using System.Security.Cryptography.X509Certificates;
using AutoMapper.Configuration.Annotations;
using Utility;
+using System.Diagnostics.Metrics;
namespace WMS.BLL.BllPdaServer
{
@@ -2081,7 +2082,7 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- public List<BoxInfoDto> GetFMBindBoxInfos(string boxno,string url)
+ /*public List<BoxInfoDto> GetFMBindBoxInfos(string boxno,string url)
{
try
{
@@ -2184,6 +2185,132 @@
{
throw ex;
}
+ }*/
+
+ public List<BoxInfoDto> GetFMBindBoxInfos(string boxno, string url)
+ {
+ try
+ {
+ #region 绠辩爜璇锋眰鎺ュ彛锛屾寮忕郴缁熸斁寮�
+ var data = new
+ {
+ BoxNo = boxno
+ };
+ var jsonData = JsonConvert.SerializeObject(data);
+
+ var response = HttpHelper.DoPost(url, jsonData, "绠辩爜淇℃伅璇锋眰", "FM");
+
+ var obj = JsonConvert.DeserializeObject<FuMaPostModel>(response);//瑙ｆ瀽杩斿洖鏁版嵁
+ if (obj.Success != true)
+ {
+ throw new Exception("璇锋眰澶辫触" + obj.Message);
+ }
+ #endregion
+
+ if (string.IsNullOrEmpty(obj.Data.SkuNo))
+ {
+ //娴嬭瘯鐢紝鍙戝竷姝ｅ紡鍓嶅垹闄ゆ娈典唬鐮�
+ //obj.Data.SkuNo = "50004632";
+ throw new Exception($"鐗╂枡缂栫爜涓嶈兘涓虹┖");
+ }
+
+ //鏌ユ壘鐗╂枡淇℃伅
+ var sku = Db.Queryable<SysMaterials>().First(m => m.SkuNo == obj.Data.SkuNo);
+ if (sku == null)
+ {
+ throw new Exception($"鏈煡璇㈠埌鐗╂枡{obj.Data.SkuNo}淇℃伅");
+ }
+
+ var pNum = 0;//鎵樼洏鐗╁搧鏁伴噺
+ var bNum = 0;//绠辩爜鐗╁搧鏁伴噺
+ //鑾峰彇鍖呰淇℃伅
+ new Common().GetPackQtyInfo(sku.PackagNo, ref pNum, ref bNum);
+ if (pNum == 0 || bNum == 0)
+ {
+ throw new Exception($"{sku.SkuNo}鐗╁搧鍖呰鏈壘鍒帮紒");
+ }
+
+ var boxList = new List<BllBoxInfo>();
+ var comTime = DateTime.Now;
+ //娣诲姞绠辩爜淇℃伅
+ foreach (var box in obj.Data.DetailList)
+ {
+ foreach (var box2 in box.DetailList2)
+ {
+ var boxInfo = new BllBoxInfo()
+ {
+ BoxNo = obj.Data.BoxNo,
+ BoxNo2 = box.BoxNo2,
+ BoxNo3 = box2.BoxNo3,
+ Qty = obj.Data.Qty,
+ BitBoxMark = obj.Data.BitBoxMark,
+
+ ASNNo = "",
+ //ASNDetailNo = noticeDetail.Id,
+ OrderCode = "",//notice.OrderCode
+ //BindNo = bindId,
+ //PalletNo = model.PallNo,
+ FullQty = bNum,
+ Status = "0",
+ SkuNo = sku.SkuNo,
+ SkuName = sku.SkuName,
+ LotNo = box2.LotNo,
+ LotText = obj.Data.LotNoBoxNum,
+ ProductionTime = DateTime.Parse(box2.ProductionTime),
+ ExpirationTime = DateTime.Parse(box2.ExpirationTime),
+ //CompleteTime = "",
+ InspectMark = "0",
+ InspectStatus = "0",
+ Origin = "璧嬬爜",
+ CreateTime = comTime,
+ CreateUser = 0
+ };
+ boxList.Add(boxInfo);
+ };
+ }
+ try
+ {
+ //寮�鍚簨鍔�
+ Db.BeginTran();
+
+ Db.Fastest<BllBoxInfo>().BulkCopy(boxList);
+
+ //鎻愪氦浜嬪姟
+ Db.CommitTran();
+ }
+ catch (Exception ex)
+ {
+ //鍥炴粴浜嬪姟
+ Db.RollbackTran();
+ throw new Exception("鎻掑叆绠辩爜澶辫触锛�" + ex.Message);
+ }
+
+ string sqlString = $@"SELECT
+ ASNNo,
+ BoxNo,
+ SkuNo,
+ SkuName,
+ LotNo,
+ BitBoxMark,
+ SUM(Qty) as Qty
+ FROM BllBoxInfo
+ WHERE IsDel = '0'
+ AND Status='0'
+ AND BoxNo = '{boxno}'
+ GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
+
+ var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);
+
+ if (models.Count == 0)
+ {
+ throw new Exception("绠辩爜淇℃伅涓嶅瓨鍦�!");
+ }
+ return models;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
}
/// <summary>
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index a14a424..44868d0 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -216,10 +216,10 @@
throw Oops.Bah("璇ユ墭鐩樹笂娌℃湁鍙嫞璐х殑绠卞瓙");
}
var boxQty = await boxInfo.GroupBy(m => m.PalletNo).Select(m => SqlFunc.AggregateSum(m.Qty)).ToListAsync();
- if (boxQty[0] > needQty)
- {
- throw Oops.Bah("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鍓╀綑寰呮嫞鏁伴噺");
- }
+ //if (boxQty[0] > needQty)
+ //{
+ // throw Oops.Bah("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鍓╀綑寰呮嫞鏁伴噺");
+ //}
var comDetailList = await Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToListAsync();
var comList = new List<BllCompleteDetail>();
@@ -337,10 +337,10 @@
throw Oops.Bah("璇ユ墭鐩樹笌绠辩爜娌℃湁缁戝畾鍏崇郴");
}
var boxQty = await boxInfo.GroupBy(m => m.BoxNo).Select(m => SqlFunc.AggregateSum(m.Qty)).ToListAsync();
- if (boxQty[0] > needQty)
- {
- throw Oops.Bah("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鍓╀綑寰呮嫞鏁伴噺");
- }
+ //if (boxQty[0] > needQty)
+ //{
+ // throw Oops.Bah("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鍓╀綑寰呮嫞鏁伴噺");
+ //}
foreach (var item in boxInfos)
{
--
Gitblit v1.8.0