组托小卫修复物料代码和id搞混，新增小卫条码规则（物料编码-供应商编码-来料批号-来料数量-采购订单编码）

llj

2 天以前 9b3790a8e5b45cdfa5a7ac9e0988340e2d43b776

组托小卫修复物料代码和id搞混，新增小卫条码规则（物料编码-供应商编码-来料批号-来料数量-采购订单编码）

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -5103,7 +5103,7 @@
        {
            try
            {
                ds = oCN.RunProcReturn($"select * from Gy_BarCodeBill where HBarCode='{HbarCode}' ", "Gy_Material");
                ds = oCN.RunProcReturn($"select *,b.hname HMaterNumber from Gy_BarCodeBill a left join Gy_Material b on a.HMaterID=b.HItemID where HBarCode='{HbarCode}' ", "Gy_Material");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";

 WebAPI/Controllers/CJGL/Cj_SingleStationController.cs

@@ -3446,7 +3446,8 @@

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Sc_UnbindStation_BarList order by æ¡ç æ—¥æœŸ desc", "h_v_Sc_UnbindStation_BarList");
                    ds = oCN.RunProcReturn("select * from h_v_Sc_UnbindStation_BarList" +
                        " order by æ¡ç æ—¥æœŸ desc", "h_v_Sc_UnbindStation_BarList");
                }
                else
                {

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

@@ -1058,7 +1058,6 @@
            string HPOInStockBillNo = ""; // æ”¶æ–™é€šçŸ¥å•å·

            string HPOOrderBillNo = ""; // é‡‡è´­è®¢å•å·

            DataSet Ds;
            msg2 = msg2.Replace("\\", "");
            msg2 = msg2.Replace("\n", "");  //\n
@@ -1069,6 +1068,7 @@
                if (ClsPub.isLong(ordrlist[j].HMaterID) != 0)
                {
                    HNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HMaterID);
                    HSupNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HSupNumber);//供应商
                    HMaterNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HMaterNumber);
                    HBatchNo = ClsPub.isStrNull(ordrlist[j].HBatchNo);

@@ -1224,11 +1224,24 @@
                        }
                        else if (CampanyName.Contains("小卫"))
                        {
                            // å°å«ç”µå™¨
                            // æ¡ç å‰ç¼€ = å•æ®å· + ç‰©æ–™ç¼–码 + æ‰¹æ¬¡å·
                            sTMNumber = HPOOrderBillNo + "@" + HMaterNumber + "@" + HBatchNo;
                            Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //获取最大流水号
                            LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
                            if(HSourceBillTypeName== "采购订单")
                            {
                               
                                //条码规则为：物料编码-供应商编码-来料批号-来料数量-采购订单编码
                                sTMNumber = HMaterNumber + "-" + HSupNumber + "-" + HBatchNo + "-" + HBQty + "-" + HPOInStockBillNo;

                                Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //获取最大流水号
                                LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
                            }
                            else
                            {
                                // å°å«ç”µå™¨
                                // æ¡ç å‰ç¼€ = å•æ®å· + ç‰©æ–™ç¼–码 + æ‰¹æ¬¡å·
                                sTMNumber = HPOOrderBillNo + "@" + HMaterNumber + "@" + HBatchNo;
                                Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //获取最大流水号
                                LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
                            }
                            
                        }
                        else  //通用方法
                        {
@@ -1427,7 +1440,7 @@
                                TM = HNumber + "@" + sHMTONo.Replace(" ","") + "@" + HBatchNo.Replace(" ","") + "@" + sHQty;
                            }
                        }

                        
                        barcode.HBarCode2 = TM;
                        barcode.HEntryID2 = ClsPub.isStrNull(j + 1);
                        barcode.HMaterID2 = ordrlist[j].HMaterID;
@@ -1568,6 +1581,7 @@
                        {
                            HBarCode = HBarCode + ClsPub.isStrNull(ListRows[i].HMTONo2);
                        }
                       
                        //
                        HMaterID = ClsPub.isLong(ListRows[i].HMaterID2);
                        HEntryID = ClsPub.isLong(ListRows[i].HEntryID2);