From 570a2d760cc1f2b78922d91d941ef81f01199e4c Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期二, 10 六月 2025 16:43:05 +0800
Subject: [PATCH] 完善ERP下发信息的处理和出库单生成流程
---
api/ApiHelper.cs | 241 ++++++++++++++++++++++++-----------------------
1 files changed, 124 insertions(+), 117 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 2bb2e4b..c415618 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -1200,9 +1200,9 @@
var taskName = TaskName.C鎴愬搧鑳跺嚭搴�
try {
- var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
+ var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
- var cgDetailList = SelectCgByTotalQty(model);
+ var cgDetailList = SelectCgByTotalQty(model.Qty, model.ItemCode, model.BatchNo, model.CntrType, model.ForcedOut);
if (cgDetailList.Count == 0) {
info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
@@ -1271,9 +1271,9 @@
var taskName = TaskName.C鎴愬搧鑳跺嚭搴�
try {
- var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
+ var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
- var cgDetailList = SelectCgByTotalQty(model);
+ var cgDetailList = SelectCgByTotalQty(model.Qty, model.ItemCode, model.BatchNo, model.CntrType, model.ForcedOut);
if (cgDetailList.Count == 0) {
info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
@@ -1331,14 +1331,14 @@
}
}
- public static List<TN_CG_Detail> SelectCgByTotalQty(FinishedOutboundInfo model) {
+ public static List<TN_CG_Detail> SelectCgByTotalQty(int qty, string itemCode, string batchNo, string cntrType = "", bool forcedOut = true) {
var db = new SqlHelper<object>().GetInstance();
var result = new List<TN_CG_Detail>();
- var targetNum = model.Qty;
+ var targetNum = qty;
var info = "";
try {
var targetCg = db.Queryable<TN_CG_Detail>()
- .Where(a => a.S_ITEM_CODE == model.ItemCode && a.S_BATCH_NO == model.BatchNo)
+ .Where(a => a.S_ITEM_CODE == itemCode && a.S_BATCH_NO == batchNo)
.Where(a => a.N_ITEM_NUM > targetNum)
.OrderBy(a => a.N_ITEM_NUM, OrderByType.Asc).First();
if (targetCg != null) //鍒氬ソ鏈変竴琛屾弧瓒虫潯浠�@@ -1351,10 +1351,18 @@
var sortedMaterials = new List<TN_CG_Detail>();
- if (model.ForcedOut) {
+ var cntrTypeList = new List<string>();
+ if (cntrType == "") {
+ cntrTypeList = new List<string> { "鎵樼洏", "濂借繍绠� }; // 涓嶆寚瀹氭墭鐩樼被鍨嬶紝浜岃�鍧囧彲
+ }
+ else {
+ cntrTypeList.Add(cntrType);
+ }
+
+ if (forcedOut) {
sortedMaterials = db.Queryable<TN_CG_Detail, TN_Loc_Container>((d, c) => d.S_CNTR_CODE == c.S_CNTR_CODE)
- .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo && d.N_ITEM_NUM > 0)
- .Where((d, c) => c.S_CNTR_TYPE == model.CntrType)
+ .Where(d => d.S_ITEM_CODE == itemCode && d.S_BATCH_NO == batchNo && d.N_ITEM_NUM > 0)
+ .Where((d, c) => cntrTypeList.Contains(c.S_CNTR_TYPE))
.Where(d => d.N_ITEM_STATE == 0 && d.S_ITEM_STATE == "鍚堟牸"
|| d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮")
.OrderBy(d => d.N_ITEM_NUM, OrderByType.Desc)
@@ -1362,13 +1370,12 @@
}
else {
sortedMaterials = db.Queryable<TN_CG_Detail, TN_Loc_Container>((d, c) => d.S_CNTR_CODE == c.S_CNTR_CODE)
- .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo && d.N_ITEM_NUM > 0)
- .Where((d, c) => c.S_CNTR_TYPE == model.CntrType)
+ .Where(d => d.S_ITEM_CODE == itemCode && d.S_BATCH_NO == batchNo && d.N_ITEM_NUM > 0)
+ .Where((d, c) => cntrTypeList.Contains(c.S_CNTR_TYPE))
.Where(d => d.N_ITEM_STATE == 0 && d.S_ITEM_STATE == "鍚堟牸")
.OrderBy(d => d.N_ITEM_NUM, OrderByType.Desc)
.OrderBy(d => d.N_ITEM_STATE, OrderByType.Asc).ToList();
}
-
if (sortedMaterials.Count == 0) //娌℃湁婊¤冻鏉′欢鐨� {
@@ -1481,124 +1488,124 @@
public static ErpResult ErpSendOutboundPlan(ErpSendOutboundPlanInfo model) {
var db = new SqlHelper<object>().GetInstance();
- var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
+ var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
var info = "";
try {
- if (string.IsNullOrEmpty(orderNo)) {
- info = "鍑哄簱鍗曞彿涓嶈兘涓虹┖";
+ // 鍙傛暟鍚堟硶鎬х‘璁ら儴鍒嗭細閿欒缂栫爜锛�00
+ if (model.pzsl <= 0) {
+ info = $"鐗╂枡鏁伴噺(pzsl){model.pzsl}涓嶅悎娉曪細鐗╂枡鏁伴噺搴旇澶т簬 0";
LogHelper.Info(info);
- return NewErpResult(2, info);
+ return NewErpResult(400, info);
}
var outboundPlan = new TN_Outbound_Plan {
- jhdh = model.jhdh,
- ckzt = model.ckzt,
- jhlb = model.jhlb,
- ckdh = model.ckdh,
- cph = model.cph,
- ysfs = model.ysfs,
- cpzt = model.cpzt,
- mddw = model.mddw,
- cpdm = model.cpdm,
- cplb = model.cplb,
- cplbmx = model.cplbmx,
- pp = model.pp,
- dj = model.dj,
- gh = model.gh,
- ph = model.ph,
- bzlx = model.bzlx,
- pzdh = model.pzdh,
- pzd_dw = model.pzd_dw,
- pzd_dybh = model.pzd_dybh,
- pzjs = model.pzjs,
- pzsl = model.pzsl,
- pz_rq = model.pz_rq,
- pz_czrq = model.pz_czrq,
- pz_zfbj = model.pz_zfbj,
- pz_zfrq = model.pz_zfrq,
- pz_bz = model.pz_bz,
- ckdbh = model.ckdbh,
- sfjs = model.sfjs,
- sfsl = model.sfsl,
- sfcs = model.sfcs,
- zcsj = model.zcsj,
- jldw = model.jldw,
- fhrq = model.fhrq,
- ckdm = model.ckdm,
- fhr = model.fhr,
- czydm = model.czydm,
- shr_username = model.shr_username,
- shrq = model.shrq,
- zfbj = model.zfbj,
- zfrq = model.zfrq,
- jsdw = model.jsdw,
- shdw = model.shdw,
- ysdw = model.ysdw,
- lxr = model.lxr,
- ry_zxg = model.ry_zxg,
- ry_ccsj = model.ry_ccsj,
- erphx_jhdh = model.erphx_jhdh,
- erphx_wlbm = model.erphx_wlbm,
- erphx_wlmc = model.erphx_wlmc,
- erphx_cjrq = model.erphx_cjrq,
- hw = model.hw,
- hwzt = model.hwzt
+ JHDH = model.jhdh, // 璁″垝鍗曞彿锛堝敮涓�爣璇嗭級
+ CKZT = model.ckzt, // 鍑哄簱鐘舵�
+ JHLB = model.jhlb, // 璁″垝绫诲埆
+ CKDH = model.ckdh, // 鍙傝�鍗曞彿
+ CPH = model.cph, // 杞︾墝鍙�+ YSFS = model.ysfs, // 杩愯緭鏂瑰紡
+ CPZT = model.cpzt, // 浜у搧鐘舵�
+ MDDW = model.mddw, // 涔版柇鍗曚綅
+ CPDM = model.cpdm, // 浜у搧浠ｇ爜
+ CPLB = model.cplb, // 浜у搧绫诲埆
+ CPLBMX = model.cplbmx, // 浜у搧绫诲埆鏄庣粏
+ PP = model.pp, // 鍝佺墝
+ DJ = model.dj, // 绛夌骇
+ GH = model.gh, // 缃愬彿
+ PH = model.ph, // 鎵瑰彿
+ BZLX = model.bzlx, // 鍖呰绫诲瀷
+ PZDH = model.pzdh, // 娲捐鍗曞彿
+ PZD_DW = model.pzd_dw, // 娲捐鍗曞崟浣�+ PZD_DYBH = model.pzd_dybh, // 娲捐鍗曡皟杩愮紪鍙�+ PZJS = model.pzjs, // 娲捐浠舵暟
+ PZSL = model.pzsl, // 娲捐鏁伴噺
+ PZ_RQ = model.pz_rq, // 娲捐鏃ユ湡(yyyy-mm-dd)
+ PZ_CZRQ = model.pz_czrq, // 娲捐鎿嶄綔鏃ユ湡
+ PZ_ZFBJ = model.pz_zfbj, // 娲捐浣滃簾鏍囪
+ PZ_ZFRQ = model.pz_zfrq, // 娲捐浣滃簾鏃ユ湡
+ PZ_BZ = model.pz_bz, // 娲捐澶囨敞
+ CKDBH = model.ckdbh, // 鍑哄簱鍗曠紪鍙�+ SFJS = model.sfjs, // 瀹炲彂浠舵暟
+ SFSL = model.sfsl, // 瀹炲彂鏁伴噺
+ SFCS = model.sfcs, // 瀹炲彂杞︽暟
+ ZCSJ = model.zcsj, // 瑁呰溅鏃堕棿
+ JLDW = model.jldw, // 璁￠噺鍗曚綅
+ FHRQ = model.fhrq, // 鍙戣揣鏃ユ湡
+ CKDM = model.ckdm, // 浠撳簱浠ｇ爜
+ FHR = model.fhr, // 鍙戣揣浜�+ CZYDM = model.czydm, // 鎿嶄綔鍛�+ SHR_USERNAME = model.shr_username, // 瀹℃牳浜�+ SHRQ = model.shrq, // 瀹℃牳鏃ユ湡
+ ZFBJ = model.zfbj, // 浣滃簾鏍囪
+ ZFRQ = model.zfrq, // 浣滃簾鏃ユ湡
+ JSDW = model.jsdw, // 缁撶畻鍗曚綅
+ SHDW = model.shdw, // 鏀惰揣鍗曚綅
+ YSDW = model.ysdw, // 杩愯緭鍗曚綅
+ LXR = model.lxr, // 鑱旂郴浜�+ RY_ZXG = model.ry_zxg, // 瑁呭嵏宸�+ RY_CCSJ = model.ry_ccsj, // 鍙夎溅鍙告満
+ ERPHX_JHDH = model.erphx_jhdh, // erp浜よ揣鍗曞彿
+ ERPHX_WLBM = model.erphx_wlbm, // erp鐗╂枡缂栫爜
+ ERPHX_WLMC = model.erphx_wlmc, // erp鐗╂枡鍚嶇О
+ ERPHX_CJRQ = model.erphx_cjrq, // erp鍒涘缓鏃ユ湡
+ HW = model.hw, // 璐т綅
+ HWZT = model.hwzt // 璐т綅鐘舵�
};
- //var cgDetailList = SelectCgByTotalQty(new FinishedOutboundInfo {
- // BatchNo = model.BatchNo,
- // CntrType= model.CntrType,
- // ItemCode= model.ItemCode,
- // EndArea= model.EndArea,
- // ForcedOut= model.ForcedOut,
- // Qty= model.Qty,
- // Spe = model.Spe
- //});
+ var cgDetailList = SelectCgByTotalQty(
+ qty: (int)model.pzsl,
+ itemCode: model.cpdm,
+ batchNo: model.ph
+ );
- //if (cgDetailList.Count == 0) {
- // info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
- // LogHelper.Info(info);
- // return NewErpResult(3, info);
- //}
+ if (cgDetailList.Count == 0) {
+ info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
+ LogHelper.Info(info);
+ return NewErpResult(3, info);
+ }
- //var order = new TN_Outbound_Order {
- // S_NO = orderNo,
- // S_ITEM_CODE = model.ItemCode,
- // S_BATCH = model.BatchNo,
- // N_END_NUM = model.Qty,
- // //F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
- // S_END_AREA = model.EndArea,
- // S_BS_NO = model.ErpNo,
- // S_BS_TYPE = "ERP",
- //};
+ var order = new TN_Outbound_Order {
+ S_NO = orderNo,
+ S_ITEM_CODE = model.cpdm,
+ S_BATCH = model.ph,
+ N_END_NUM = (int)model.pzsl,
+ //F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
+ S_END_AREA = model.ysfs == "姹借溅" ? "QCCKQ" : "HCCKQ", // 鏆傛椂鐢ㄨ繍杈撴柟寮忥紙鐏溅/姹借溅锛夋潵鍖哄垎缁堢偣璐у尯
+ S_BS_NO = model.jhdh,
+ S_BS_TYPE = "ERP",
+ };
- //var detailList = new List<TN_Outbound_Detail>();
- //foreach (var cgDetail in cgDetailList) {
- // var detail = new TN_Outbound_Detail {
- // S_OO_NO = orderNo,
- // S_ITEM_CODE = cgDetail.S_ITEM_CODE,
- // S_BATCH_NO = cgDetail.S_BATCH_NO,
- // S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- // N_COUNT = cgDetail.N_ITEM_NUM,
- // S_END_AREA = model.EndArea
- // };
- // detailList.Add(detail);
- //}
+ var detailList = new List<TN_Outbound_Detail>();
+ foreach (var cgDetail in cgDetailList) {
+ var detail = new TN_Outbound_Detail {
+ S_OO_NO = orderNo,
+ S_ITEM_CODE = cgDetail.S_ITEM_CODE,
+ S_BATCH_NO = cgDetail.S_BATCH_NO,
+ S_CNTR_CODE = cgDetail.S_CNTR_CODE,
+ N_COUNT = cgDetail.N_ITEM_NUM,
+ S_END_AREA = order.S_END_AREA, // order涓篸etail鐨勬瘡涓�釜璐т綅璁剧疆缁堢偣鍊�+ S_BS_NO = order.S_BS_NO,
+ S_BS_TYPE= order.S_BS_TYPE,
+ };
+ detailList.Add(detail);
+ }
using (var tran = db.Ado.UseTran()) {
- //if (db.Insertable<TN_Outbound_Order>(order).ExecuteCommand() <= 0) {
- // tran.RollbackTran();
- // info = "鐢熸垚鍑哄簱鍗曞け璐ワ細" + JsonConvert.SerializeObject(order);
- // LogHelper.Info(info);
- // return NewErpResult(2, info);
- //}
+ if (db.Insertable<TN_Outbound_Order>(order).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = "鐢熸垚鍑哄簱鍗曞け璐ワ細" + JsonConvert.SerializeObject(order);
+ LogHelper.Info(info);
+ return NewErpResult(2, info);
+ }
- //if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
- // tran.RollbackTran();
- // info = "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐�;
- // LogHelper.Info(info);
- // return NewErpResult(4, info);
- //}
+ if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐�;
+ LogHelper.Info(info);
+ return NewErpResult(4, info);
+ }
+
if (db.Insertable<TN_Outbound_Plan>(outboundPlan).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = "鐢熸垚鍑哄簱鍗曡鍒掕褰曡〃澶辫触";
--
Gitblit v1.9.1