From 7b93639991a652a7d6e52ab6b390e786b12b663b Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 07 八月 2025 12:45:33 +0800
Subject: [PATCH] 夏宝返修码格式调整；可打印备料单报表查询；生产汇报单审核同步到金蝶时添加生产日期字段；
---
DAL/基础资料/InterFace基础资料/ClsIF_Material_View.cs | 1
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 47 +++++++++++++++++++++++
WarM/条码打印/Gy_BarCodeBill_Rework.cs | 14 +++++--
WebAPI/DLL/ClsSc_ICMOReportBill.cs | 1
Model/基础资料/基础资料/ClsGy_Material_Model.cs | 3 -
5 files changed, 60 insertions(+), 6 deletions(-)
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/InterFace\345\237\272\347\241\200\350\265\204\346\226\231/ClsIF_Material_View.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/InterFace\345\237\272\347\241\200\350\265\204\346\226\231/ClsIF_Material_View.cs"
index 0cc6203..e05341b 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/InterFace\345\237\272\347\241\200\350\265\204\346\226\231/ClsIF_Material_View.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/InterFace\345\237\272\347\241\200\350\265\204\346\226\231/ClsIF_Material_View.cs"
@@ -170,6 +170,7 @@
omodel.HISKFPERIOD = DBUtility.ClsPub.isBool(DS.Tables[0].Rows[0]["HISKFPERIOD"]);
omodel.HEXPPERIOD = Convert.ToInt64(DS.Tables[0].Rows[0]["HEXPPERIOD"]);
omodel.HEXPUNIT = DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HEXPUNIT"]);
+ omodel.HSubjoin2 = DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HSubjoin2"]);
return true;
}
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Material_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Material_Model.cs"
index 4c8e82a..9c6105f 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Material_Model.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Material_Model.cs"
@@ -34,7 +34,7 @@
public Int64 HSPGroupID;// int --默认仓库组
public Int64 HSPID;// int --默认仓位
public string HSubjoin;// --附加属性
- public string HSubjoin2;// --附加属性
+ public string HSubjoin2;// --附加属性 夏宝用（机型码）
public string HColor;// --颜色
public Int64 HErpclsID;// int --物料属性
public string HPicNo;// varchar --图号
@@ -50,6 +50,5 @@
public bool HISKFPERIOD; //是否启用保质期
public Int64 HEXPPERIOD; //保质期
public string HEXPUNIT; //保质期单位
-
}
}
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
index 51987b0..45511c3 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
@@ -623,8 +623,10 @@
if (HBarCodeType == "鍞竴鏉＄爜")
{
//鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
- sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
- Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ //sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
+ sTMNumber = sYear + sPeriod + sDay;
+
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo_ReWorkBar '" + sTMNumber + "'", "h_p_WMS_GetMaxNo_ReWorkBar"); //鑾峰彇鏈�澶ф祦姘村彿
LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
}
else
@@ -670,8 +672,9 @@
{
Int32 HModelLen = grdMain.Rows[j].Cells[HMaterModelCol].Value.ToString().Length;
string HModelLeft = HModelLen >= 4 ? grdMain.Rows[j].Cells[HMaterModelCol].Value.ToString() : "";
- //鏉＄爜缂栧彿 = 宸ュ巶浠ｇ爜锛�1锛� + 骞� + 杞﹂棿浠ｇ爜锛�060113锛� + 鏈� + 鍨嬪彿 + 鏃� + 娴佹按鍙�
- TM = 1 + sYear + 060113 + sPeriod + HModelLeft + sDay + LSH;
+ string HSubjoin2 = grdMain.Rows[j].Cells[HSubjoin2Col].Value.ToString();
+ //鏉＄爜缂栧彿 = 宸ュ巶浠ｇ爜锛�1锛� + 杞﹂棿浠ｇ爜锛�060113锛�+ 鏈哄瀷鍙� + 骞� + 鏈� + 鏃� + 娴佹按鍙�
+ TM = "1" + 060113.ToString() + HSubjoin2 + sYear + sPeriod + sDay + LSH.ToString("D5");
}
HEntryID = j + 1;
@@ -910,6 +913,8 @@
grdMain.Columns[HInnerBillNoCol].Visible = false;
grdMain.Columns[HEndDateCol].Visible = false;
grdMain.Columns[HBillNoCol].Visible = false;
+ grdMain.Columns[HAuxPropNumberCol].Visible = false;
+ grdMain.Columns[HAuxPropNameCol].Visible = false;
//璁剧疆鍙紪杈戝垪
string sAllowCol = HQtyCol.ToString() +
@@ -1050,6 +1055,7 @@
grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = oMater.omodel.HAuxPropName;
grdMain.Rows[sRow].Cells[HBatchManagerCol].Value = oMater.omodel.HBatchManager;
grdMain.Rows[sRow].Cells[HISKFPERIODCol].Value = oMater.omodel.HISKFPERIOD;
+ grdMain.Rows[sRow].Cells[HSubjoin2Col].Value = oMater.omodel.HSubjoin2;
grdMain.Rows[sRow].Cells[HBarCodeTypeCol].Value = "鍞竴鏉＄爜";
//鍚敤鎵规
if (oMater.omodel.HBatchManager)
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index a1a1b62..b9f2e7b 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -2443,5 +2443,52 @@
}
}
#endregion
+
+ #region 鍙墦鍗板鏂欏崟鎶ヨ〃锛堟坊搴凤級
+
+ [Route("Sc_ProcessExchangeBill/AllowedPrint")]
+ [HttpGet]
+ public object AllowedPrint(string sWhere, string user, string Organization, int page, int size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ sWhere = sWhere.Replace("'", "''");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_Sc_ProcessExchangeBillList_AllowedPrint " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_Sc_ProcessExchangeBillList_AllowedPrint");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_Sc_ProcessExchangeBillList_AllowedPrint " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_Sc_ProcessExchangeBillList_AllowedPrint");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
diff --git a/WebAPI/DLL/ClsSc_ICMOReportBill.cs b/WebAPI/DLL/ClsSc_ICMOReportBill.cs
index f148454..938bc34 100644
--- a/WebAPI/DLL/ClsSc_ICMOReportBill.cs
+++ b/WebAPI/DLL/ClsSc_ICMOReportBill.cs
@@ -497,6 +497,7 @@
FentityModel.Add("FScrapQty", item["FScrapQty"].ToString());//鎶ュ簾鏁伴噺
FentityModel.Add("FBASEFINISHQTY", item["FBASEFINISHQTY"].ToString());//鍩烘湰鍗曚綅瀹屾垚鏁伴噺
FentityModel.Add("FFINISHQTY", item["FFINISHQTY"].ToString());//瀹屾垚鏁伴噺
+ FentityModel.Add("FProduceDate", item["HPRODUCEDATE"].ToString());//鐢熶骇鏃ユ湡
FentityModel.Add("FLot", new JObject() { ["FNumber"] = item["FLot"].ToString() });//鎵瑰彿
//
if (oSystemParameter.omodel.WMS_CampanyName == "涔濊彵") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
--
Gitblit v1.9.1