Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
| | |
| | | ",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 + "'" + |
| | |
| | | ",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() + |
| | |
| | | ",'" + 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) |
| | |
| | | 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; |
| | |
| | | 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; //å
é |
| | | } |
| | | } |
| | |
| | | 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;//æåå· |
| | | } |
| | | } |
| | |
| | | { |
| | | 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"]); |
| | | } |
| | | |
| | | //============================================================================================== |
| | | //-==================å·¥åºæµè½¬å¡ |
| | |
| | | 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; //å·¥åºæµè½¬å¡ä¿åèªå¨åæ¥æ¡ç æ¡£æ¡ |
| | |
| | | { |
| | | 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; |
| | |
| | | ,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"; |
| | |
| | | ",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(); |
| | |
| | | ",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); |
| | |
| | | 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) |