From 531f16f2f15bf792e3e719e00abb57a95356dedd Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期一, 21 四月 2025 12:04:15 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Business.MES/iERP/MES_U9C.cs | 437 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 281 insertions(+), 156 deletions(-)
diff --git a/Tiger.Business.MES/iERP/MES_U9C.cs b/Tiger.Business.MES/iERP/MES_U9C.cs
index ef3c5ad..409c02d 100644
--- a/Tiger.Business.MES/iERP/MES_U9C.cs
+++ b/Tiger.Business.MES/iERP/MES_U9C.cs
@@ -26,13 +26,19 @@
{
public partial class MES_U9C : IMES_U9C
{
- public static string U9CAuthLoginUrl { get; set; } = Biz.SysParam["U9CAuthLoginUrl_Test", "U9CUrl"].PARAM_VALUE; // "http://172.16.80.20/U9C/webapi/OAuth2/AuthLogin?"; 娴嬭瘯
- //public static string U9CAuthLoginUrl { get; set; } = Biz.SysParam["U9CAuthLoginUrl", "U9CUrl"].PARAM_VALUE; //姝ｅ紡
+ public static string U9CAuthLoginUrl { get; set; } = ApiConfig.IsTestServer ? Cache.SysParam["U9CAuthLoginUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["U9CAuthLoginUrl", "U9CUrl"].PARAM_VALUE; // "http://172.16.80.20/U9C/webapi/OAuth2/AuthLogin?"; 娴嬭瘯
+ //public static string U9CAuthLoginUrl { get; set; } = Cache.SysParam["U9CAuthLoginUrl", "U9CUrl"].PARAM_VALUE; //姝ｅ紡
public static string secret = "&entcode=02&orgcode=101&clientid=mes&clientsecret=12c8ee7e9bb74ad2a6a0fb3315c8af20";
public static string RcvRptDocCreateUrl
- { get; set; } = Biz.SysParam["RcvRptDocCreateUrl_Test", "U9CUrl"].PARAM_VALUE; //"http://172.16.80.20/u9C/webapi/RcvRptDoc/Create"; 娴嬭瘯
+ { get; set; } = ApiConfig.IsTestServer ? Cache.SysParam["RcvRptDocCreateUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["RcvRptDocCreateUrl", "U9CUrl"].PARAM_VALUE; //"http://172.16.80.20/u9C/webapi/RcvRptDoc/Create"; 娴嬭瘯
//public static string RcvRptDocCreateUrl
- //{ get; set; } = Biz.SysParam["RcvRptDocCreateUrl", "U9CUrl"].PARAM_VALUE; //姝ｅ紡
+ //{ get; set; } = Cache.SysParam["RcvRptDocCreateUrl", "U9CUrl"].PARAM_VALUE; //姝ｅ紡
+
+ public static string U9CBarcodeCreateUrl
+ { get; set; } = ApiConfig.IsTestServer ? Cache.SysParam["U9CBarcodeCreateUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["U9CBarcodeCreateUrl", "U9CUrl"].PARAM_VALUE;
+
+ public static string CreateBarCodeByAssignQtyUrl
+ { get; set; } = ApiConfig.IsTestServer ? Cache.SysParam["CreateBarCodeByAssignQty_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["CreateBarCodeByAssignQty", "U9CUrl"].PARAM_VALUE;
/// <summary>
/// 鍏ュ簱鍗曟帴鍙�
@@ -45,158 +51,158 @@
var action = new ApiAction<RcvRptDocCreateInput>();
try
{
- //鍏堜繚瀛樻暟鎹�
- bool IsSuccessed = true;
- var db = Biz.Db;
- var dbTran = db.UseTran(() =>
- {
- var s = db.Storageable(input.ErpProdInBths, "U9C_RcvRptDocCreate")
- .WhereColumns(t => new { t.ORDER_NO, t.WORK_ORDER, t.GHOST_ROW })
- .ToStorage();
- s.AsInsertable.ExecuteCommand();
- s.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
- });
- if (!dbTran.IsSuccess)
- {
- action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
- Logger.Interface.Error(action.Message);
- IsSuccessed = false;
- }
-
//淇濆瓨鎴愬姛锛岃皟鐢║9C鎺ュ彛-娴嬭瘯鐢�
- int i = 1;
- List<BIZ_ERP_PROD_IN_BTH> ErpProdInBths = new List<BIZ_ERP_PROD_IN_BTH>();
- foreach (var item in input.RcvRptDocBases.Where(q => q.Status != "Y"))
- {
- var ErpProdInBth = Biz.Db.Queryable<BIZ_ERP_PROD_IN_BTH>().Where(q => q.WORK_ORDER == item.WorkOrder).First();
- item.Status = "Y";
- if (!ErpProdInBth.IsNullOrEmpty())
- {
- ErpProdInBth.ORDER_NO = $"YDRKD241200006";
- ErpProdInBth.IS_HANDLED = "Y";
- ErpProdInBth.HANDLED_DATE = DateTime.Now;
- ErpProdInBths.Add(ErpProdInBth);
- }
- foreach (var p in input.PrintJsons)
- {
- var d = p.Items.Where(q => q.WORK_ORDER == item.WorkOrder).FirstOrDefault();
- if (!d.IsNullOrEmpty())
- {
- d.ORDER_NO = $"YDRKD241200006";
- d.STATUS = "Y";
- }
- }
- i++;
- }
- var _db = Biz.Db;
- var _dbTran = _db.UseTran(() =>
- {
- _db.Updateable(ErpProdInBths, "U9C_RcvRptDocCreate").UpdateColumns(x => new { x.ORDER_NO, x.REMARK, x.IS_HANDLED, x.HANDLED_DATE }).ExecuteCommand();
- });
- if (!dbTran.IsSuccess)
- {
- action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
- Logger.Interface.Error(action.Message);
- IsSuccessed = false;
- }
- input.ErpProdInBths = ErpProdInBths;
+ //int i = 1;
+ //foreach (var item in input.RcvRptDocBases.Where(q => q.Status != "Y"))
+ //{
+ // var ErpProdInBth = input.ErpProdInBths.Where(q => q.WORK_ORDER == item.WorkOrder).FirstOrDefault();
+ // item.Status = "Y";
+ // if (!ErpProdInBth.IsNullOrEmpty())
+ // {
+ // ErpProdInBth.ORDER_NO = $"YDRKD24120000{5 + i}";
+ // ErpProdInBth.IS_HANDLED = "Y";
+ // ErpProdInBth.HANDLED_DATE = DateTime.Now;
+ // }
+ // List<RcvRptDocCreateParam> param = new() {
+ // new() {
+ // CompleteList = new(){
+ // new CompleteList
+ // {
+ // MOKey = new MOKey { DocNo = item.WorkOrder },
+ // Wh = new Wh { Code = item.WhCode },
+ // DescFlexField = new DescFlexField { PrivateDescSeg1 = item.PkgQty.ToString() },
+ // Item = new Item { Code = item.ItemCode },
+ // CompleteQty = item.CompleteQty,
+ // OutputType = item.OutputType,
+ // StorageType = item.StorageType,
+ // DocState = item.DocState,
+ // }
+ // },
+ // Remark = "鎺ュ彛鐢熸垚",
+ // BusinessDate = DateTime.Now,
+ // }
+ // };
+ // foreach (var p in input.PrintJsons)
+ // {
+ // var d = p.Items.Where(q => q.WORK_ORDER == item.WorkOrder).FirstOrDefault();
+ // if (!d.IsNullOrEmpty())
+ // {
+ // d.ORDER_NO = $"YDRKD24120000{5 + i}";
+ // d.IS_HANDLED = "Y";
+ // }
+ // }
+ // i++;
+ //}
+ //var _db = Biz.Db;
+ //var _dbTran = _db.UseTran(() =>
+ //{
+ // _db.Updateable(input.ErpProdInBths, "U9C_RcvRptDocCreate").UpdateColumns(x => new { x.ORDER_NO, x.REMARK, x.IS_HANDLED, x.HANDLED_DATE, x.UPDATE_USER, x.UPDATE_TIME }).ExecuteCommand();
+ //});
+ //if (!_dbTran.IsSuccess)
+ //{
+ // action.CatchExceptionWithLog(_dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
+ // Logger.Interface.Error(action.Message);
+ // //IsSuccessed = false;
+ //}
//淇濆瓨鎴愬姛锛岃皟鐢║9C鎺ュ彛
- //if (IsSuccessed)
- //{
- // var u9CLoginResult = await HttpHelper.GetAsync<U9CLoginResult>($"{U9CAuthLoginUrl}userCode={input.userId}{secret}");
- // if (u9CLoginResult.Success)
- // {
- // var token = u9CLoginResult.Data;
- // Logger.Interface.Info($"U9C鐧诲綍token: {token}");
- // List<BIZ_ERP_PROD_IN_BTH> ErpProdInBths = new List<BIZ_ERP_PROD_IN_BTH>();
- // foreach (var item in input.RcvRptDocBases.Where(q => q.Status != "Y"))
- // {
- // List<RcvRptDocCreateParam> param = new() {
- // new() {
- // CompleteList = new(){
- // new CompleteList
- // {
- // MOKey = new MOKey { DocNo = item.WorkOrder },
- // Wh = new Wh { Code = item.WhCode },
- // DescFlexField = new DescFlexField { PrivateDescSeg1 = item.PkgQty.ToString() },
- // Item = new Item { Code = item.ItemCode },
- // CompleteQty = item.CompleteQty,
- // OutputType = item.OutputType,
- // StorageType = item.StorageType,
- // DocState = item.DocState,
- // }
- // },
- // Remark = "鎺ュ彛鐢熸垚",
- // BusinessDate = DateTime.Now,
- // }
- // };
- // var response = await HttpHelper.PostAsync(RcvRptDocCreateUrl, JsonConvert.SerializeObject(param), new Dictionary<string, string>() { { "token", token } });
- // var result = JsonConvert.DeserializeObject<U9CResult>(response.Message);
- // var ErpProdInBth = Biz.Db.Queryable<BIZ_ERP_PROD_IN_BTH>().Where(q => q.WORK_ORDER == item.WorkOrder).First();
- // if (result != null)
- // {
- // if (result.Success && result.Data[0].m_isSucess)
- // {
- // Logger.Interface.Info($"鐢熸垚鍏ュ簱鍗曟帴鍙ｆ彁浜son: {JsonConvert.SerializeObject(param)}锛岃繑鍥濲son: {response.Message}");
- // item.Status = "Y";
- // if (!ErpProdInBth.IsNullOrEmpty())
- // {
- // ErpProdInBth.ORDER_NO = result.Data[0].m_code;
- // ErpProdInBth.IS_HANDLED = "Y";
- // ErpProdInBth.HANDLED_DATE = DateTime.Now;
- // ErpProdInBths.Add(ErpProdInBth);
- // }
- // foreach (var p in input.PrintJsons)
- // {
- // var d = p.Items.Where(q => q.WORK_ORDER == item.WorkOrder && q.STATUS != "P").FirstOrDefault();
- // if (!d.IsNullOrEmpty())
- // {
- // d.ORDER_NO = result.Data[0].m_code;
- // d.STATUS = "Y";
- // }
- // }
- // Logger.Interface.Info($"鐢熸垚鍏ュ簱鍗曟垚鍔�");
- // }
- // else
- // {
- // action.IsSuccessed = false;
- // action.LocaleMsg = new($"{action.Message}; {result.Data[0].m_errorMsg}");
- // item.Status = "F";
- // if (!ErpProdInBth.IsNullOrEmpty())
- // {
- // ErpProdInBth.REMARK = result.Data[0].m_errorMsg;
- // ErpProdInBth.IS_HANDLED = "F";
- // ErpProdInBth.HANDLED_DATE = DateTime.Now;
- // ErpProdInBths.Add(ErpProdInBth);
- // }
- // foreach (var p in input.PrintJsons)
- // {
- // var d = p.Items.Where(q => q.WORK_ORDER == item.WorkOrder && q.STATUS != "P").FirstOrDefault();
- // if (!d.IsNullOrEmpty())
- // {
- // d.ORDER_NO = result.Data[0].m_code;
- // d.STATUS = "F";
- // }
- // }
- // Logger.Interface.Info($"鐢熸垚鍏ュ簱鍗曞け璐�:{result.Data[0].m_errorMsg}");
- // }
- // }
- // }
- // var _db = Biz.Db;
- // var _dbTran = _db.UseTran(() =>
- // {
- // _db.Updateable(ErpProdInBths, "U9C_RcvRptDocCreate").UpdateColumns(x => new { x.ORDER_NO, x.REMARK, x.IS_HANDLED, x.HANDLED_DATE }).ExecuteCommand();
- // });
- // if (!dbTran.IsSuccess)
- // {
- // action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
- // Logger.Interface.Error(action.Message);
- // IsSuccessed = false;
- // }
- // input.ErpProdInBths = ErpProdInBths;
- // }
- //}
+ var u9CLoginResult = await HttpHelper.GetAsync<U9CLoginResult>($"{U9CAuthLoginUrl}userCode={input.userId}{secret}");
+ if (u9CLoginResult.Success)
+ {
+ var token = u9CLoginResult.Data;
+ Logger.Interface.Info($"U9C鐧诲綍token: {token}");
+ foreach (var item in input.RcvRptDocBases.Where(q => q.Status != "Y"))
+ {
+ List<RcvRptDocCreateParam> param = new() {
+ new() {
+ CompleteList = new(){
+ new CompleteList
+ {
+ MOKey = new MOKey { DocNo = item.WorkOrder },
+ Wh = new Wh { Code = item.WhCode },
+ DescFlexField = new DescFlexField { PrivateDescSeg1 = item.PkgQty.ToString() },
+ Item = new Item { Code = item.ItemCode },
+ CompleteQty = item.CompleteQty,
+ OutputType = item.OutputType,
+ StorageType = item.StorageType,
+ DocState = item.DocState,
+ }
+ },
+ Remark = "鎺ュ彛鐢熸垚",
+ BusinessDate = DateTime.Now,
+ }
+ };
+ var response = await HttpHelper.PostAsync(RcvRptDocCreateUrl, JsonConvert.SerializeObject(param), new Dictionary<string, string>() { { "token", token } });
+ var result = JsonConvert.DeserializeObject<U9CResult>(response.Message);
+ var ErpProdInBth = input.ErpProdInBths.Where(q => q.WORK_ORDER == item.WorkOrder).FirstOrDefault();
+ if (result != null)
+ {
+ if (result.Success && result.Data[0].m_isSucess)
+ {
+ Logger.Interface.Info($"鐢熸垚鍏ュ簱鍗曟帴鍙ｆ彁浜son: {JsonConvert.SerializeObject(param)}锛岃繑鍥濲son: {response.Message}");
+ item.Status = "Y";
+ if (!ErpProdInBth.IsNullOrEmpty())
+ {
+ ErpProdInBth.ORDER_NO = result.Data[0].m_code;
+ ErpProdInBth.IS_HANDLED = "Y";
+ ErpProdInBth.HANDLED_DATE = DateTime.Now;
+ }
+ foreach (var p in input.PrintJsons)
+ {
+ var d = p.Items.Where(q => q.WORK_ORDER == item.WorkOrder && q.IS_HANDLED != "P").FirstOrDefault();
+ if (!d.IsNullOrEmpty())
+ {
+ d.ORDER_NO = result.Data[0].m_code;
+ d.IS_HANDLED = "Y";
+ }
+ }
+ Logger.Interface.Info($"鐢熸垚鍏ュ簱鍗曟垚鍔�");
+
+ //鏉＄爜涓绘。
+ BarcodeCreateInput barcodeCreateInput = new()
+ {
+ RevDocId = result.Data[0].m_iD,
+ userId = input.userId,
+ token = token,
+ IsLogin = false,
+ };
+ await U9CBarcodeCreate(barcodeCreateInput);
+ }
+ else
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = new($"{action.Message}; {result.Data[0].m_errorMsg}");
+ item.Status = "F";
+ if (!ErpProdInBth.IsNullOrEmpty())
+ {
+ ErpProdInBth.REMARK = result.Data[0].m_errorMsg;
+ ErpProdInBth.IS_HANDLED = "F";
+ ErpProdInBth.HANDLED_DATE = DateTime.Now;
+ }
+ foreach (var p in input.PrintJsons)
+ {
+ var d = p.Items.Where(q => q.WORK_ORDER == item.WorkOrder && q.IS_HANDLED != "P").FirstOrDefault();
+ if (!d.IsNullOrEmpty())
+ {
+ d.ORDER_NO = result.Data[0].m_code;
+ d.IS_HANDLED = "F";
+ }
+ }
+ Logger.Interface.Info($"鐢熸垚鍏ュ簱鍗曞け璐�:{result.Data[0].m_errorMsg}");
+ }
+ }
+ }
+ var _db = Biz.Db;
+ var _dbTran = _db.UseTran(() =>
+ {
+ _db.Updateable(input.ErpProdInBths, "U9C_RcvRptDocCreate").UpdateColumns(x => new { x.ORDER_NO, x.REMARK, x.IS_HANDLED, x.HANDLED_DATE, x.UPDATE_USER, x.UPDATE_TIME }).ExecuteCommand();
+ });
+ if (!_dbTran.IsSuccess)
+ {
+ action.CatchExceptionWithLog(_dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
+ Logger.Interface.Error(action.Message);
+ }
+ }
input.labels = GetLabels(input.PrintJsons);
action.Data = input;
}
@@ -208,14 +214,133 @@
return action;
}
- private List<BAS_LABEL_TEMP> GetLabels(List<InStorePrintJson> printJsons) {
+ /// <summary>
+ /// 鍏ュ簱鍗曟潯鐮佷富妗ｆ帴鍙�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<ApiAction<BarcodeCreateInput>> U9CBarcodeCreate(BarcodeCreateInput input)
+ {
+ Logger.Interface.Info($"/**\r\n *杩涘叆鍏ュ簱鍗曟潯鐮佷富妗ｆ帴鍙�....\r\n */\r\n"); //鍥哄畾鍐欐硶
+ var action = new ApiAction<BarcodeCreateInput>();
+ try
+ {
+ if (input.IsLogin)
+ {
+ var u9CLoginResult = await HttpHelper.GetAsync<U9CLoginResult>($"{U9CAuthLoginUrl}userCode={input.userId}{secret}");
+ if (u9CLoginResult.Success)
+ {
+ input.token = u9CLoginResult.Data;
+ Logger.Interface.Info($"U9C鐧诲綍token: {input.token}");
+ }
+ }
+ List<BarcodeCreateParam> param = new() {
+ new() {
+ CreateEntityKeys = new(){
+ new CreateEntityKeys
+ {
+ ID = input.RevDocId, //鍏ュ簱鍗旾D
+ EntityType="UFIDA.U9.Complete.RCVRpt.RcvRptDoc"
+ }
+ },
+ IsCreateHeadBarCode = true,
+ BarCodeRuleCode = "DJCPRK01",
+ GenerateCount = 1,
+ BCQty = 1,
+ }
+ };
+ var response = await HttpHelper.PostAsync(U9CBarcodeCreateUrl, JsonConvert.SerializeObject(param), new Dictionary<string, string>() { { "token", input.token } });
+ var result = JsonConvert.DeserializeObject<U9CResult>(response.Message);
+ if (result != null)
+ {
+ if (result.Success && result.Data[0].m_isSucess)
+ {
+ Logger.Interface.Info($"鐢熸垚鍏ュ簱鍗曟潯鐮佷富妗ｆ帴鍙ｆ彁浜son: {JsonConvert.SerializeObject(param)}锛岃繑鍥濲son: {response.Message}");
+ }
+ else
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = new($"{action.Message}; {result.Data[0].m_errorMsg}");
+ Logger.Interface.Info($"鐢熸垚鍏ュ簱鍗曟潯鐮佷富妗ｅけ璐�:{result.Data[0].m_errorMsg}");
+ }
+ }
+ }
+ catch (System.Exception ex)
+ {
+ action.CatchExceptionWithLog(ex, "鐢熸垚鍏ュ簱鍗曟潯鐮佷富妗ｅ紓甯�");
+ }
+ Logger.Interface.Info($"/* 鍏ュ簱鍗曟潯鐮佷富妗ｆ帴鍙ｇ粨鏉� */\r\n"); //鍥哄畾鍐欐硶
+ return action;
+ }
+
+ /// <summary>
+ /// 鍗婃垚鍝佺敓鎴愭潯鐮佹帴鍙�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<ApiAction<List<string>>> U9CCreateBarCodeByAssignQty(BarcodeCreateByAssignQtyInput input)
+ {
+ Logger.Interface.Info($"/**\r\n *杩涘叆鍗婃垚鍝佺敓鎴愭潯鐮佹帴鍙�....\r\n */\r\n"); //鍥哄畾鍐欐硶
+ var action = new ApiAction<List<string>>(new List<string>());
+ try
+ {
+ if (input.IsLogin)
+ {
+ var u9CLoginResult = await HttpHelper.GetAsync<U9CLoginResult>($"{U9CAuthLoginUrl}userCode={input.userId}{secret}");
+ if (u9CLoginResult.Success)
+ {
+ input.token = u9CLoginResult.Data;
+ Logger.Interface.Info($"U9C鐧诲綍token: {input.token}");
+ }
+ }
+ List<BarcodeCreateByAssignQtyParam> param = new() {
+ new() {
+ CreateBarCodeEntitys = new(){
+ new CreateBarCodeEntitys
+ {
+ EntityID = input.RevDocLineId, //鍏ュ簱鍗旾D
+ EntityType="UFIDA.U9.Complete.RCVRpt.RcvRptDocLine"
+ }
+ },
+ BarCodeRuleID = "1002308220305008",
+ CreateBarCodeItemQty = input.CreateBarCodeItemQty,
+ LabelQty = input.LabelQty,
+ }
+ };
+ var response = await HttpHelper.PostAsync(CreateBarCodeByAssignQtyUrl, JsonConvert.SerializeObject(param), new Dictionary<string, string>() { { "token", input.token } });
+ var result = JsonConvert.DeserializeObject<BarcodeCreateByAssignQtyResult>(response.Message);
+ if (result != null)
+ {
+ if (result.Success && result.Data.IsSuccess)
+ {
+ Logger.Interface.Info($"鍗婃垚鍝佺敓鎴愭潯鐮佹帴鍙ｆ彁浜son: {JsonConvert.SerializeObject(param)}锛岃繑鍥濲son: {response.Message}");
+ action.Data = result.Data.Data;
+ }
+ else
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = new($"{action.Message}; {result.Data.ErrorMessage}");
+ Logger.Interface.Info($"鍗婃垚鍝佺敓鎴愭潯鐮佸け璐�:{result.Data.ErrorMessage}");
+ }
+ }
+ }
+ catch (System.Exception ex)
+ {
+ action.CatchExceptionWithLog(ex, "鍗婃垚鍝佺敓鎴愭潯鐮佸紓甯�");
+ }
+ Logger.Interface.Info($"/* 鍗婃垚鍝佺敓鎴愭潯鐮佹帴鍙ｇ粨鏉� */\r\n"); //鍥哄畾鍐欐硶
+ return action;
+ }
+
+ private List<BAS_LABEL_TEMP> GetLabels(List<InStorePrintJson> printJsons)
+ {
List<BAS_LABEL_TEMP> labels = new List<BAS_LABEL_TEMP>();
int i = 1;
int j = 1;
foreach (var p in printJsons)
{
BAS_LABEL_TEMP label = Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == "InstoreTemplate").IncludesAllFirstLayer().First();
- foreach (var v in p.Items.Where(q => q.STATUS != "F" && q.STATUS != "P"))
+ foreach (var v in p.Items.Where(q => q.IS_HANDLED != "F" && q.IS_HANDLED != "P"))
{
foreach (var item in label.Variables)
{
@@ -253,7 +378,7 @@
}
if (item.VAR_NAME == $"BoxQty{j}")
{
- item.Value = v.PLAN_QTY.ToString();
+ item.Value = v.CartonQty.ToString();
}
if (item.VAR_NAME == $"InQty{j}")
{
--
Gitblit v1.9.3