Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

wtt

9 天以前 9b6cd6ba2508314b3a4967b3764153170d40e66c

 WebAPI/Controllers/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Sc_BarCodeController.cs

@@ -593,14 +593,14 @@
                            ordrlist.HGiveAwayFlag = 0;
                        }
                    }
                    if (HSourceBillType == "采购订单•")
                    if (HSourceBillType == "收料通知单" || HSourceBillType == "采购订单")
                    {
                        if (oSystemParameter.omodel.WMS_CampanyName == "海诚š") //系统参数  å®¢æˆ·å®šåˆ¶åŒ–名称     ç©ºç™½ä¸ºé€šç”¨
                        if (oSystemParameter.omodel.WMS_CampanyName == "海诚")   //系统参数  å®¢æˆ·å®šåˆ¶åŒ–名称     ç©ºç™½ä¸ºé€šç”¨
                        {
                            ordrlist.HSourceBillSEQ = dt.Rows[i]["HSEQ"].ToString();
                            ordrlist.HFactory = dt.Rows[i]["客户编号"].ToString();
                            ordrlist.HCoilNO = dt.Rows[i]["款号"].ToString();
                            ordrlist.HFurnaceNO = dt.Rows[i]["分组„"].ToString();
                            ordrlist.HFurnaceNO = dt.Rows[i]["分组"].ToString();
                        }
                    }
                }
@@ -669,17 +669,17 @@
                ordrlist.HDate = dt.Rows[i]["日期"].ToString(); 
                ordrlist.HShowDate = DateTime.Now.ToString();

                if (HSourceBillType == "采购入库单")
                if(HSourceBillType=="采购入库单")
                {
                    if (oSystemParameter.omodel.WMS_CampanyName == "海诚š") //系统参数  å®¢æˆ·å®šåˆ¶åŒ–名称     ç©ºç™½ä¸ºé€šç”¨
                    if(oSystemParameter.omodel.WMS_CampanyName=="海诚")   //系统参数  å®¢æˆ·å®šåˆ¶åŒ–名称     ç©ºç™½ä¸ºé€šç”¨
                    {
                        ordrlist.HInnerBillNo = dt.Rows[i]["采购订单号"].ToString();
                        ordrlist.HSupID = dt.Rows[i]["HSupID"].ToString();
                        ordrlist.HSupNumber = dt.Rows[i]["供应商代码"].ToString();
                        ordrlist.HSupName = dt.Rows[i]["供应商•†"].ToString();
                        ordrlist.HSupNumber = dt.Rows[i]["供应商代码"].ToString();
                        ordrlist.HSupName = dt.Rows[i]["供应商"].ToString();
                        ordrlist.HFactory = dt.Rows[i]["客户编号"].ToString();
                        ordrlist.HCoilNO = dt.Rows[i]["款号"].ToString();
                        ordrlist.HFurnaceNO = dt.Rows[i]["分组„"].ToString();
                        ordrlist.HFurnaceNO = dt.Rows[i]["分组"].ToString();
                    }
                }
            }
@@ -1219,12 +1219,14 @@
                            string sHMTONo = "";            //计划跟踪号
                            string sHSourceBillNo = "";     //源单单号
                            string sHSourceBillSEQ = "";    //源单行号
                            string sHSourceEntryID = "";    //源单子ID
                            string sSupNumber = "";         //供应商代码
                            string sHQty = "";              //数量

                            sHMTONo = DBUtility.ClsPub.isStrNull(ordrlist[j].HMTONo);
                            sHSourceBillNo = DBUtility.ClsPub.isStrNull(ordrlist[j].HBillNo);
                            sHSourceBillSEQ = DBUtility.ClsPub.isStrNull(ordrlist[j].HSourceBillSEQ);
                            sHSourceEntryID = DBUtility.ClsPub.isStrNull(ordrlist[j].HSubID);
                            sSupNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HSupNumber);
                            sHQty = DBUtility.ClsPub.isStrNull(HMinQty);

@@ -1233,10 +1235,15 @@
                                //条码规则：采购订单单号@行号@物料代码@MTO@数量@供应商代码
                                TM = sHSourceBillNo + "@" + sHSourceBillSEQ + "@" + HMaterNumber + "@" + sHMTONo + "@" + sHQty + "@" + sSupNumber;
                            }
                            else if (DBUtility.ClsPub.isStrNull(ordrlist[j].HBillType) == "1103") //源单：收料通知单
                            {
                                //条码规则：收料通知单号@单据子内码@物料代码@MTO@数量@供应商代码
                                TM = sHSourceBillNo + "@" + sHSourceEntryID + "@" + HMaterNumber + "@" + sHMTONo + "@" + sHQty + "@" + sSupNumber;
                            }
                            else
                            {
                                //条码规则：物料内码@MTO@数量
                                TM = HNumber + "@" + sHMTONo + "@" + sHQty;
                                //条码规则：物料内码@MTO@批次号@数量
                                TM = HNumber + "@" + sHMTONo + "@" + HBatchNo + "@" + sHQty;
                            }
                        }