From b7ca9d7706ecb5037c9f23b419aa6ba52dcdc048 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 27 三月 2023 23:01:33 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 20 ++++++++++
Model/生产管理/ClsSc_ICMOBillSub.cs | 6 ++
Model/车间管理/ClsSc_ProcessExchangeBillMain.cs | 6 +++
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 3 +
WebAPI/Models/ClsGy_Material_Model.cs | 4 +
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 4 ++
DAL/车间管理/ClsSc_ProcessExchangeBill.cs | 17 +++++++-
WebAPI/Controllers/生产管理/生产任务单/Sc_ICMOBillController.cs | 6 ++-
WebAPI/DLL/ClsGy_Material_Ctl.cs | 6 ++-
9 files changed, 63 insertions(+), 9 deletions(-)
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
index 7cc58a5..6b3a41c 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
@@ -97,7 +97,12 @@
",HXTNumber='" + omodel.HXTNumber + "'" +
",HXTModel='" + omodel.HXTModel + "'" +
",HCusNumber='" + omodel.HCusNumber + "'" +
-
+ ",HMaterModel='" + omodel.HMaterModel + "'" +
+ ",HWidth='" + omodel.HWidth + "'" +
+ ",HWeight='" + omodel.HWeight + "'" +
+ ",HAuxQty='" + omodel.HAuxQty + "'" +
+ ",HAuxUnit='" + omodel.HAuxUnit + "'" +
+ ",HSplitNo='" + omodel.HSplitNo + "'" +
",HProdMaterCode='" + omodel.HProdMaterCode + "'" +
",HSeOrderBillNo='" + omodel.HSeOrderBillNo + "'" +
",HCusShortName='" + omodel.HCusShortName + "'" +
@@ -299,7 +304,7 @@
",HProdMaterName,HCusName,HWorkRemark,HImportNote,HMaterNumber_A" +
",HMaterNumber_B,HMaterNumber_C,HMaterNumber_D,HProdType,HMaterShortName" +
",HMaterIDA,HMaterIDB,HMaterIDC,HMaterIDD,HICMOEntryID" + ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum,HPRDORGID,HBLFlag,HCusNumber,HPickLabel,HPickLabelNumber,HXTNumber,HXTModel,HWorkBillSortNo" +
- ", HRoutingBillID) " +
+ ", HRoutingBillID,HMaterModel,HWidth,HWeight,HAuxQty,HAuxUnit,HSplitNo) " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()," + "" + (omodel.HPrevMainSourceInterID == 0 ? omodel.HInterID : omodel.HPrevMainSourceInterID) +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HBatchNo + "'," + omodel.HMainMaterID.ToString() + "," + omodel.HKeyMaterID.ToString() + "," + omodel.HNo.ToString() + ",'" + omodel.HOrderProcNO + "'" +
"," + omodel.HWWOrderInterID.ToString() + "," + omodel.HWWOrderEntryID.ToString() + ",'" + omodel.HWWOrderBillNo + "'," + omodel.HICMOInterID.ToString() + "," + omodel.HEquipMentID.ToString() +
@@ -311,7 +316,7 @@
",'" + omodel.HMaterNumber_B + "','" + omodel.HMaterNumber_C + "','" + omodel.HMaterNumber_D + "','" + omodel.HProdType + "','" + omodel.HMaterShortName + "'" +
",'" + omodel.HMaterIDA + "','" + omodel.HMaterIDB + "','" + omodel.HMaterIDC + "','" + omodel.HMaterIDD + "'," + omodel.HICMOEntryID +
",'" + omodel.HPicNumVer + "','" + omodel.HPicNumAssemble + "','" + omodel.HMaterTexture + "','" + omodel.HProductNum + "','" + omodel.HVerNum + "','"+ omodel.HPRDORGID+ "','" + (omodel.HBLFlag ? 1 : 0) + "','" + omodel.HCusNumber + "','" + omodel.HPickLabel + "','" + omodel.HPickLabelNumber + "','" + omodel.HXTNumber + "','" + omodel.HXTModel + "','" + omodel.HWorkBillSortNo +
- "',"+ omodel.HRoutingBillID + ") ");
+ "',"+ omodel.HRoutingBillID + ",'"+ omodel.HMaterModel + "',"+ omodel.HWidth + ","+ omodel.HWeight + ","+ omodel.HAuxQty + ","+ omodel.HAuxUnit +","+ omodel.HSplitNo +")" );
sErr = sErr + "1;";
//鎻掑叆瀛愯〃
foreach (Model.ClsSc_ProcessExchangeBillSub oSub in DetailColl)
@@ -521,6 +526,12 @@
omodel.HVerNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HVerNum"]);
omodel.HRoutingBillID = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRoutingBillID"]);
omodel.HPRDORGID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPRDORGID"]);
+ omodel.HMaterModel = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterModel"]);
+ omodel.HWidth = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HWidth"]);
+ omodel.HWeight = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HWeight"]);
+ omodel.HAuxQty = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HAuxQty"]);
+ omodel.HAuxUnit = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HAuxUnit"]);
+ omodel.HSplitNo = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HSplitNo"]);
//
//寰幆
DataSet DsSub;
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ICMOBillSub.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ICMOBillSub.cs"
index 6c65ac6..e670b53 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ICMOBillSub.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ICMOBillSub.cs"
@@ -34,6 +34,10 @@
public Int64 HPRODUCTTYPE; //产品类型,
public double HCOSTRATE; // 权重,
public Int64 HBASEUNITID; //基本计量单位,
- public string HBatchNo; //生产批次号,
+ public string HBatchNo; //生产批次号,
+ public double HAuxQty; //辅数量
+ public int HAuxUnit; //辅助单位
+ public double HWidth; //幅宽
+ public double HWeight; //克重
}
}
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs"
index ece4cac..35eaeba 100644
--- "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs"
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs"
@@ -73,5 +73,11 @@
public string HXTNumber;
public string HXTModel;
public string HRoutingBillID;//工艺路线ID
+ public string HMaterModel;//材料规格
+ public double HWidth;//幅宽
+ public double HWeight;//克重
+ public double HAuxQty;//辅数量
+ public int HAuxUnit;//辅助单位
+ public int HSplitNo;//拆分号
}
}
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index c92895a..93daf59 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -2762,6 +2762,26 @@
{
omodel.BarCode_UpdatePrintQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //选源单生产入库单生成条码时是否自动同步生成条码出入库记录（'Y'为自动同步）
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_AutoProductInBillWMS")
+ {
+ omodel.BarCode_AutoProductInBillWMS = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //选源单采购入库单生成条码时是否自动同步生成条码出入库记录（'Y'为自动同步）
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_AutoPOStockInBillWMS")
+ {
+ omodel.BarCode_AutoPOStockInBillWMS = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //选源单生产退料单生成条码时是否自动同步生成条码出入库记录（'Y'为自动同步）
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_AutoMateOutBackBillWMS")
+ {
+ omodel.BarCode_AutoMateOutBackBillWMS = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //选源单销售退货单生成条码时是否自动同步生成条码出入库记录（'Y'为自动同步）
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_AutoSellOutBackBillWMS")
+ {
+ omodel.BarCode_AutoSellOutBackBillWMS = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//==============================================================================================
//-==================工序流转卡
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index 09d6508..2725c1c 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -345,6 +345,10 @@
public long BarCode_PrintQty; //允许条码打印次数（1、2、3.....）
public string BarCode_PrintQtyCtl; //条码打印次数控制（是否只允许打印一次控制，Y 只允许打印一次）
public string BarCode_UpdatePrintQtyCtl;//条码打印次数更新(打印条码时，是否更新条码打印次数，Y 更新)
+ public string BarCode_AutoProductInBillWMS; //选源单生产入库单生成条码时是否自动同步生成条码出入库记录（'Y'为自动同步）
+ public string BarCode_AutoPOStockInBillWMS; //选源单采购入库单生成条码时是否自动同步生成条码出入库记录（'Y'为自动同步）
+ public string BarCode_AutoMateOutBackBillWMS; //选源单生产退料单生成条码时是否自动同步生成条码出入库记录（'Y'为自动同步）
+ public string BarCode_AutoSellOutBackBillWMS; //选源单销售退货单生成条码时是否自动同步生成条码出入库记录（'Y'为自动同步）
//工序流转卡
public string Sc_ProcessExchangeBill_AutoBarCode; //工序流转卡保存自动同步条码档案
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index 04832e2..fd7de8a 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -445,6 +445,9 @@
{
Main.HBillNo = ListHbillNo[i].HBillNo;
Main.HQty = ListHbillNo[i].HQty;
+ Main.HSplitNo = ListHbillNo[i].HSplitNo;
+ Main.HAuxQty = 0;
+ Main.HAuxUnit = 0;
oBill.omodel = Main;
int j = 0;
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
index 1415402..9a42063 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
@@ -558,13 +558,15 @@
,HBeginDate,HEndDate
,HMaterID,HUnitID,HRemark,HSourceID,HDeptID,HSTATUS
,HBomID,HEntryCusID,HSTOCKINORGID
- ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney)
+ ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney
+ ,HAuxQty,HAuxUnit,HWidth,HWeight)
values({HInterID},{HEntryID},{(oSub.HQty == null ? 0 : oSub.HQty)}
,'{(oSub.HPlanBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HPlanBeginDate.ToString())}','{(oSub.HPlanEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HPlanEndDate.ToString())}'
,'{(oSub.HBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HBeginDate.ToString())}','{(oSub.HEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HEndDate.ToString())}'
,{oSub.HMaterID},{oSub.HUnitID},'{oSub.HRemark}',{oSub.HSourceID},{oSub.HDeptID},{oSub.HSTATUS}
,{oSub.HBomID} ,{oSub.HCusID} ,{oSub.HSTOCKINORGID}
- ,0,0,'','',0,0)");
+ ,0,0,'','',0,0
+ ,{oSub.HAuxQty},{oSub.HAuxUnit},{oSub.HWidth},{oSub.HWeight})");
objJsonResult.code = "1";
diff --git a/WebAPI/DLL/ClsGy_Material_Ctl.cs b/WebAPI/DLL/ClsGy_Material_Ctl.cs
index 963f2db..2adb5fb 100644
--- a/WebAPI/DLL/ClsGy_Material_Ctl.cs
+++ b/WebAPI/DLL/ClsGy_Material_Ctl.cs
@@ -26,14 +26,14 @@
",HKeepDays,HPlanPrice,HstdPrice,HQtyMin,HQtyMax" +
",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID,HMinPickQty,HUSEORGID,HERPItemID" +
",HSALEUNITID,HSALEPRICEUNITID,HBASEUNITID,HSTOREUNITID,HCHECKINCOMING,HCHECKPRODUCT,HPERUNITSTANDHOUR" +
- ",HSTDLABORPREPARETIME,HSTDMACHINEPREPARETIME) " +
+ ",HSTDLABORPREPARETIME,HSTDMACHINEPREPARETIME,HWidth,HWeight) " +
" Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
",'" + oModel.HModel + "'," + oModel.HUnitID.ToString() + "," + oModel.HMaterClsID.ToString() + "," + oModel.HMaterTypeID.ToString() + "," + oModel.HUnitGroupID.ToString() +
", " + oModel.HWhID.ToString() + "," + oModel.HRoutingID.ToString() + "," + oModel.HBomID.ToString() + "," + oModel.HSecUnitID.ToString() + "," + oModel.HSecUnitRate.ToString() +
", " + oModel.HHighStock.ToString() + "," + oModel.HLowStock.ToString() + "," + oModel.HSafeStock.ToString() + "," + oModel.HOrderPrice.ToString() + ",'" + oModel.HSalePrice + "'" +
", " + oModel.HKeepDays.ToString() + "," + oModel.HPlanPrice.ToString() + "," + oModel.HstdPrice.ToString() + "," + oModel.HQtyMin.ToString() + "," + oModel.HQtyMax.ToString() +
- ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HUSEORGID + "," + oModel.HERPItemID + "," + oModel.HSALEUNITID + "," + oModel.HSALEPRICEUNITID + "," + oModel.HBASEUNITID + "," + oModel.HSTOREUNITID + "," + oModel.HCHECKINCOMING + "," + oModel.HCHECKPRODUCT + "," + oModel.HPERUNITSTANDHOUR + "," + oModel.HSTDLABORPREPARETIME + "," + oModel.HSTDMACHINEPREPARETIME + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HUSEORGID + "," + oModel.HERPItemID + "," + oModel.HSALEUNITID + "," + oModel.HSALEPRICEUNITID + "," + oModel.HBASEUNITID + "," + oModel.HSTOREUNITID + "," + oModel.HCHECKINCOMING + "," + oModel.HCHECKPRODUCT + "," + oModel.HPERUNITSTANDHOUR + "," + oModel.HSTDLABORPREPARETIME + "," + oModel.HSTDMACHINEPREPARETIME + ","+ oModel.HWidth + "," + oModel.HWeight + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCn.Commit();
@@ -137,6 +137,8 @@
",HCHECKPRODUCT=" + oModel.HCHECKPRODUCT.ToString() +
",HPERUNITSTANDHOUR=" + oModel.HPERUNITSTANDHOUR.ToString() +
",HSTDLABORPREPARETIME=" + oModel.HSTDLABORPREPARETIME.ToString() +
+ ",HWeight=" + oModel.HWeight.ToString() +
+ ",HWidth=" + oModel.HWidth.ToString() +
",HSTDMACHINEPREPARETIME=" + oModel.HSTDMACHINEPREPARETIME.ToString() + "Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
diff --git a/WebAPI/Models/ClsGy_Material_Model.cs b/WebAPI/Models/ClsGy_Material_Model.cs
index ebf90b3..1daed48 100644
--- a/WebAPI/Models/ClsGy_Material_Model.cs
+++ b/WebAPI/Models/ClsGy_Material_Model.cs
@@ -44,7 +44,9 @@
public int HCREATEORGID;
public int HBatchManager;
public string HOldMaterNumber;
-
+ public double HWidth; //骞呭
+ public double HWeight; //鍏嬮噸
+
public int HSALEUNITID; //閿�鍞閲忓崟浣�(gy_unit)
public int HSALEPRICEUNITID; //閿�鍞浠疯閲忓崟浣�(gy_unit)
public int HBASEUNITID; //鍩烘湰璁￠噺鍗曚綅(gy_unit)
--
Gitblit v1.9.1