1

duhe

5 天以前 dc2ebe0b75c5191802e3fe993dc3e1d7b1862835

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

@@ -593,7 +593,7 @@
                            ordrlist.HGiveAwayFlag = 0;
                        }
                    }
                    if (HSourceBillType == "采购订单")
                    if (HSourceBillType == "收料通知单" || HSourceBillType == "采购订单")
                    {
                        if (oSystemParameter.omodel.WMS_CampanyName == "海诚") //系统参数  å®¢æˆ·å®šåˆ¶åŒ–名称     ç©ºç™½ä¸ºé€šç”¨
                        {
@@ -983,8 +983,7 @@
                            //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
                            LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
                        }
                        else if (CampanyName == "瑞与祺")
                        {
                        else if (CampanyName == "瑞与祺") {
                            var date = DateTime.Now.ToString("yyMMdd");//日期
                            if (HSourceBillTypeName == "收料通知单")
                            {
@@ -1220,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);

@@ -1234,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;
                            }
                        }

@@ -1558,7 +1564,7 @@
        }
        #endregion

        #region æ¡ç å­˜å…¥æ¡ç ä¸»æ¡£
        #region æ¡ç è½¬å­˜æ¡ç ä¸»æ¡£
        /// <summary>
        /// æ¡ç è½¬å­˜æ¡ç ä¸»æ¡£
        /// </summary>
@@ -1572,7 +1578,7 @@
            {
                var _value = msg["msg"].ToString();
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.None);
                string msg2 = sArray[0].ToString();
                string HOrgType = sArray[1].ToString();
                string HSourceBillTypeName = sArray[2].ToString();
@@ -1580,6 +1586,9 @@
                string CampanyName = sArray[4].ToString() == "xxx" ? "" : sArray[4].ToString();
                string UserName = sArray[5].ToString();
                string barCodeNo = sArray[6].ToString();
                string HFactory = sArray[7].ToString();
                string HCoilNO = sArray[8].ToString();
                string HFurnaceNO = sArray[9].ToString();
                ClsPub.CurUserName = UserName;

                //获取内码
@@ -1608,12 +1617,12 @@
                }
                else
                {

                    string HBarCodeType = ClsPub.isStrNull(HSelectBarCodeType);
                    // æ¡ç è½¬å­˜
                    msg2 = msg2.Replace("\\", "");
                    msg2 = msg2.Replace("\n", "");  //\n
                    List<HSouceOrderList> ordrlist = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HSouceOrderList>>(msg2);
                    LogService.Write(ordrlist[0]);
                    // LogService.Write(ordrlist[0]);

                    long HSourceInterID = string.IsNullOrEmpty(ordrlist[0].HMainID) == true ? 0 : ClsPub.isLong(ordrlist[0].HMainID);
                    long HSourceEntryID = string.IsNullOrEmpty(ordrlist[0].HSubID) == true ? 0 : ClsPub.isLong(ordrlist[0].HSubID);
@@ -1630,12 +1639,15 @@
                        ",@HMTONO = N'" + ordrlist[0].HMTONo + "'" +
                        ",@HBarCodeDate = N'" + ordrlist[0].HDate + "'" +
                        ",@HEmpID = " + ordrlist[0].HEmpID +
                        ",@HGroupID = " + ordrlist[0].HGroupID +
                        ",@HSourceInterID = " + HSourceInterID +
                        ",@HSourceEntryID = " + HSourceEntryID +
                        ",@HBarCodeType = N'" + HSelectBarCodeType + "'"+
                        ",@HSourceBillNo = N'" + ordrlist[0].HBillNo + "'"+
                        ",@HMaker = N'" + UserName + "'"
                        ",@HBarCodeType = N'" + HBarCodeType + "'" + 
                        ",@HSourceBillNo = N'" + ordrlist[0].HSourceBillNo + "'" +
                        ",@HMaker = N'" + ordrlist[0].HMaker + "'" +
                        ",@HFactory = N'" + HFactory + "'" +
                        ",@HCoilNO = N'" + HCoilNO + "'" +
                        ",@HFurnaceNO = N'" + HFurnaceNO + "'" +
                        ",@HInnerBillNo = N'" + ordrlist[0].HSourceBillNo + "'"
                        , "h_p_SC_BarCode_Transfer");

                    if ((bool)ds1.Tables[0].Rows[0]["returntype"] == true)