From 2de09bec5cc05bf875543fa8956167ca7db73021 Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期三, 25 六月 2025 11:36:44 +0800
Subject: [PATCH] 合并
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveZDPInfo.cs | 142 +++++++++++++++++++++++++----------------------
1 files changed, 76 insertions(+), 66 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveZDPInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveZDPInfo.cs"
index f4bd44e..522e8ab 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveZDPInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveZDPInfo.cs"
@@ -7,6 +7,7 @@
using WIDESEA_Common;
using WIDESEA_Common.ZY;
using WIDESEA_Core;
+using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_Model.Models;
@@ -26,92 +27,101 @@
{
//濡傚綋鍓嶅瓨鍦ㄦ湭寮�濮嬪叆搴撶殑杞﹁疆鎴栧埗鍔ㄧ洏鏁版嵁,鍒欑姝繚瀛樻柊鏁版嵁 浠ラ槻鏁版嵁娣蜂贡
var waitInbound = _InWheels_MesRepository.QueryFirst(x => x.Wheels_CurrentStatue == "0");
- if (waitInbound != null) throw new Exception("褰撳墠瀛樺湪鏈紑濮嬪叆搴撶殑杞﹁疆鎴栧埗鍔ㄧ洏,璇峰厛鍏ュ簱鍚庡啀淇濆瓨淇℃伅!");
+ if (waitInbound != null) throw new Exception("褰撳墠瀛樺湪鏈紑濮嬪叆搴撶殑鍒跺姩鐩�,璇峰厛鍏ュ簱鍚庡啀淇濆瓨淇℃伅!");
- //杞﹁疆鐮�
+ //鍒跺姩鐩樻潯鐮�
string clCode = saveModel.MainData["code"].ToString();
if (string.IsNullOrEmpty(clCode))
- throw new Exception($"杞﹁疆鏉＄爜涓嶈兘涓虹┖");
+ throw new Exception($"鍒跺姩鐩樻潯鐮佷笉鑳戒负绌�");
- var clinfo = _InWheels_MesRepository.QueryFirst(x => x.Wheels_code == clCode);
- if (clinfo != null) throw new Exception("杞﹁疆褰曞叆淇℃伅宸插瓨鍦�");
+ var clinfo = _InZdp_MesRepository.QueryFirst(x => x.Zdp_code == clCode);
+ if (clinfo != null) throw new Exception("鍒跺姩鐩樻潯鐮佸綍鍏ヤ俊鎭凡瀛樺湪");
//妫�娴嬪簱瀛樻槸鍚﹀凡瀛樺湪
- _WheelsStockRepository.QueryFirst(x => x.Wheels_code == clCode);
+ _ZdpStockRepository.QueryFirst(x => x.Zdp_code == clCode);
if (clinfo != null) throw new Exception("搴撳唴宸插瓨鍦�,璇锋鏌ュ簱瀛�");
//搴忓垪鍙�
//string madeUnit = saveModel.MainData["xlh"].ToString();
- //杞﹁疆鍙�
- string clh = saveModel.MainData["clh"].ToString();
- //杞鏉＄爜
- string ldtm = saveModel.MainData["ldtm"].ToString();
+ //鍒跺姩鐩樺彿
+ string ZPH = saveModel.MainData["ZPH"].ToString();
//杞﹀瀷
string Cartype = saveModel.MainData["chexing"].ToString();
- //閰嶅睘灞�
- string psj = saveModel.MainData["psj"].ToString();
- //杞︾粍鍙�
- string lcch = saveModel.MainData["lcch"].ToString();
//鏂版棫
string newOrOld = saveModel.MainData["neworold"].ToString();
- //杞鍙�
- string ldh = saveModel.MainData["ldh"].ToString();
- //杞鍨嬪彿
- string ldxh = saveModel.MainData["ldxh"].ToString();
- //姣傚瓟绛夌骇
- string gkdj = saveModel.MainData["gkdj"].ToString();
- //姣傚瓟a鐣岄潰鍧囧��
- string gkzja = saveModel.MainData["gkzja"].ToString();
- //姣傚瓟b鐣岄潰鍧囧��
- string gkzjb = saveModel.MainData["gkzjb"].ToString();
- //姣傚瓟c鐣岄潰鍧囧��
- string gkzjc = saveModel.MainData["gkzjc"].ToString();
- //杞緞鍊�
- string ljz = saveModel.MainData["ljz"].ToString();
- //棰勪及杞緞鍊�
- string yglj = saveModel.MainData["yglj"].ToString();
- //鍏ュ簱鏃堕棿
+ //浣嶇疆(渚�/涓�)
+ string POS = saveModel.MainData["POS"].ToString();
+ // 铻烘爴鍨嬪彿
+ string LSXH = saveModel.MainData["LSXH"].ToString();
+ //鏉愯川(閾搁挗)
+ string MAT = saveModel.MainData["MAT"].ToString();
+ //浜у湴(杩涘彛/鍥戒骇)
+ string SITE = saveModel.MainData["SITE"].ToString();
+ //姣傚瓟鐩村緞A1
+ string GKA1 = saveModel.MainData["GKA1"].ToString();
+ //姣傚瓟鐩村緞A2
+ string GKA2 = saveModel.MainData["GKA2"].ToString();
+ //姣傚瓟鐩村緞A3
+ string GKA3 = saveModel.MainData["GKA3"].ToString();
+ //姣傚瓟鐩村緞A
+ string GKA = saveModel.MainData["GKA"].ToString();
+ //姣傚瓟鐩村緞B1
+ string GKB1 = saveModel.MainData["GKB1"].ToString();
+ //姣傚瓟鐩村緞B2
+ string GKB2 = saveModel.MainData["GKB2"].ToString();
+ //姣傚瓟鐩村緞A3
+ string GKB3 = saveModel.MainData["GKB3"].ToString();
+ //姣傚瓟鐩村緞A
+ string GKB = saveModel.MainData["GKB"].ToString();
+ //姣傚瓟鐩村緞C1
+ string GKC1 = saveModel.MainData["GKC1"].ToString();
+ //姣傚瓟鐩村緞C2
+ string GKC2 = saveModel.MainData["GKC2"].ToString();
+ //姣傚瓟鐩村緞C3
+ string GKC3 = saveModel.MainData["GKC3"].ToString();
+ //姣傚瓟鐩村緞A
+ string GKC = saveModel.MainData["GKC"].ToString();
+ //姣傚瓟鐩村緞
+ string GKJZ = saveModel.MainData["GKJZ"].ToString();
+ //铻烘爴渚у墿浣欑（鑰�
+ string LSCSYMH = saveModel.MainData["LSCSYMH"].ToString();
+ //铻烘瘝渚у墿浣欑（鑰�
+ string LMCSYMH = saveModel.MainData["LMCSYMH"].ToString();
+ //鍏ュ簱鏃ユ湡
string rksj = saveModel.MainData["rksj"].ToString();
- //灞炴��
- string WheelsProps = saveModel.MainData["clsx"].ToString();
- //鍔ㄦ嫋灞炴��
- string mttype = saveModel.MainData["mttype"].ToString();
- //姣傚瓟鍧囧��
- string gkcc = saveModel.MainData["gkcc"].ToString();
- //鍒涘缓浜�
- //string user = saveModel.MainData["user"].ToString();
+ if (_locationRepository.QueryData(x => x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1).Count < 2) throw new Exception($"搴撲綅鏁伴噺涓嶈冻,涓嶅厑璁稿叆搴�");
-
- Dt_InWheels_mes wheels_Mes = new Dt_InWheels_mes
+ Dt_InZdp_mes dt_InZdp_ = new Dt_InZdp_mes
{
- Wheels_code = clCode,
- Wheels_Type = "1",
- Wheels_Num = clh,
- CreateDate = DateTime.Now,
- Creater = "admin",
- WheelsProps = WheelsProps,
- Wheels_CarNo = lcch,
- Wheels_CarType = Cartype,
- Wheels_ldxh = ldxh,
- Wheels_CurrentStatue = "0",
- Wheels_ldtm = ldtm,
- Wheels_InDate = rksj,
- Wheels_level = gkdj,
- Wheels_NewOrOld = newOrOld,
- Wheels_psj = psj,
- Wheels_gkcc = gkcc,
- Wheels_gkzja = gkzja,
- Wheels_gkzjb = gkzjb,
- Wheels_gkzjc = gkzjc,
- Wheels_ldh = ldh,
- Wheels_ljz = ljz,
- Wheels_mttype = mttype,
- //Wheels_SequenceNum = "",
- Wheels_ygljz = yglj,
+ Zdp_code = clCode, // 涓婚敭鎴栫紪鍙�
+ Zdp_ZPH = ZPH, // 鍒跺姩鐩樺彿
+ Zdp_chexing = Cartype, // 杞﹀瀷
+ Zdp_neworold = newOrOld, // 鏂版棫
+ Zdp_POS = POS, // 浣嶇疆锛堜晶/涓級
+ Zdp_LSXH = LSXH, // 铻烘爴鍨嬪彿
+ Zdp_MAT = MAT, // 鏉愯川锛堥摳閽級
+ Zdp_SITE = SITE, // 浜у湴锛堣繘鍙�/鍥戒骇锛�
+ Zdp_GKA1 = GKA1, // 姣傚瓟鐩村緞A1
+ Zdp_GKA2 = GKA2, // 姣傚瓟鐩村緞A2
+ Zdp_GKA3 = GKA3, // 姣傚瓟鐩村緞A3
+ Zdp_GKA = GKA, // 姣傚瓟鐩村緞A
+ Zdp_GKB1 = GKB1, // 姣傚瓟鐩村緞B1
+ Zdp_GKB2 = GKB2, // 姣傚瓟鐩村緞B2
+ Zdp_GKB3 = GKB3, // 姣傚瓟鐩村緞B3
+ Zdp_GKB = GKB, // 姣傚瓟鐩村緞B
+ Zdp_GKC1 = GKC1, // 姣傚瓟鐩村緞C1
+ Zdp_GKC2 = GKC2, // 姣傚瓟鐩村緞C2
+ Zdp_GKC3 = GKC3, // 姣傚瓟鐩村緞C3
+ Zdp_GKC = GKC, // 姣傚瓟鐩村緞C
+ Zdp_GKJZ = GKJZ, // 姣傚瓟鐩村緞鍩哄噯
+ Zdp_LSCSYMH = LSCSYMH, // 铻烘爴渚у墿浣欑（鑰�
+ Zdp_LMCSYMH = LMCSYMH, // 铻烘瘝渚у墿浣欑（鑰�
+ Zdp_rksj = rksj, // 鍏ュ簱鏃ユ湡
+ Zdp_CurrentStatue="0"
};
- if (_InWheels_MesRepository.AddData(wheels_Mes) > 0)
+ if (_InZdp_MesRepository.AddData(dt_InZdp_) > 0)
{
return content.OK("淇濆瓨鎴愬姛");
}
--
Gitblit v1.9.3