智云外网版WMS\MES\SCM(作废)
yxj
2022-09-27 1dc303dbbbaf5b4182961611516120518476c623
条码生成模块,生成条码时四维尔增加是否启用批号判断控制
2个文件已修改
42 ■■■■ 已修改文件
SCM/公用类/ClsPub1.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM/条码打印/Gy_BarCodeBill.cs 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM/¹«ÓÃÀà/ClsPub1.cs
@@ -14,11 +14,8 @@
        //public static string WEBSURL = "http://124.70.129.242/WEBS-WMS/WebService1.asmx";             //雅琪诺
        //public static string WEBSURL = "http://192.168.1.29/WEBS-WMS/WebService1.asmx";               //圣龙    å†…网
        //public static string WEBSURL = "http://122.227.138.236/WEBS-WMS/WebService1.asmx";            //圣龙(不用)
        public static string WEBSURL = "http://220.189.218.154:8091/WEBS-WMS/WebService1.asmx";       //四维尔   å¤–网
        //public static string WEBSURL = "http://192.168.0.66/WEBS-WMS/WebService1.asmx";               //四维尔   å†…网
        //public static string WEBSURL = "http://220.189.218.154:8091/WEBS-WMS-TEST/WebService1.asmx";  //四维尔测试
        //public static string WEBSURL = "http://220.189.218.154:8092/WEBS-WMS/WebService1.asmx";   //四维尔    æ–°ä¸­é—´å±‚    å¤–网
        //public static string WEBSURL = "http://192.168.0.178/WEBS-WMS/WebService1.asmx";          //四维尔    æ–°ä¸­é—´å±‚    å†…网
        public static string WEBSURL = "http://192.168.0.178/WEBS-WMS/WebService1.asmx";          //四维尔    æ–°ä¸­é—´å±‚    å†…网
        //public static string WEBSURL = "http://122.227.199.62:5050/LMESWEBS/WebService1.asmx";        //韩电    å¤–网JIT(不用)
        //public static string WEBSURL = "http://122.227.199.62:5050/WMSWEBS/WebService1.asmx";         //韩电    å¤–网
        //public static string WEBSURL = "http://192.168.10.60/WMSWEBS/WebService1.asmx";               //韩电    å†…网宁波
SCM/ÌõÂë´òÓ¡/Gy_BarCodeBill.cs
@@ -643,13 +643,42 @@
                }
                else if (CampanyName == "四维尔") 
                {
                    if (BarCodeCheckAuxPropID(ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value)) && ClsPub.isLong(grdMain.Rows[j].Cells[HAuxPropIDCol].Value) == 0)
                    long sHMaterID = 0;
                    sHMaterID = ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value);
                    if (sHMaterID != 0)
                    {
                        MessageBox.Show(" ç¬¬" + ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value) + "行,物料:" + ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNameCol].Value) + " ï¼Œå¯ç”¨äº†è¾…助属性,辅助属性列不允许为空,请先选择对应辅助属性!");
                        return false;
                        //判断CLOUD物料辅助属性表里该物料是否启用了物料属性(1为启用)
                        DataSet DS = oWeb.getDataSetBySQL("exec h_p_Gy_BarCodeCheckAuxPropID_CLD " + sHMaterID, "h_p_Gy_BarCodeCheckAuxPropID_CLD", ref DBUtility.ClsPub.sExeReturnInfo);
                        //
                        if (DS == null || DS.Tables[0].Rows.Count == 0)
                        {
                            MessageBox.Show(" ç¬¬" + ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value) + "行,物料:" + ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNameCol].Value) + " ï¼Œåœ¨é‡‘蝶云中未查询到该物料信息!");
                            return false;
                        }
                        else if (DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["FISENABLE"]) == 1 && ClsPub.isLong(grdMain.Rows[j].Cells[HAuxPropIDCol].Value) == 0)
                        {
                            MessageBox.Show(" ç¬¬" + ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value) + "行,物料:" + ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNameCol].Value) + " ï¼Œå¯ç”¨äº†è¾…助属性,辅助属性列不允许为空,请先选择对应辅助属性!");
                            return false;
                        }
                        else if (DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HBatchManager"]) == 1 && DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value) == "")
                        {
                            MessageBox.Show(" ç¬¬" + ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value) + "行,物料:" + ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNameCol].Value) + " ï¼Œå¯ç”¨æ‰¹æ¬¡ç®¡ç†ï¼Œæ‰¹æ¬¡ä¸å…è®¸ä¸ºç©ºï¼");
                            return false;
                        }
                        else if (DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HBatchManager"]) == 0 && DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value) != "")
                        {
                            MessageBox.Show(" ç¬¬" + ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value) + "行,物料:" + ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNameCol].Value) + " ï¼Œæœªå¯ç”¨æ‰¹æ¬¡ç®¡ç†ï¼Œä¸å…è®¸æœ‰æ‰¹æ¬¡ï¼");
                            return false;
                        }
                    }
                }
                    ////原控制
                    //if (BarCodeCheckAuxPropID(ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value)) && ClsPub.isLong(grdMain.Rows[j].Cells[HAuxPropIDCol].Value) == 0)
                    //{
                    //    MessageBox.Show(" ç¬¬" + ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value) + "行,物料:" + ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNameCol].Value) + " ï¼Œå¯ç”¨äº†è¾…助属性,辅助属性列不允许为空,请先选择对应辅助属性!");
                    //    return false;
                    //}
                }
            }
            if (CampanyName == "森楷") //系统参数  å®¢æˆ·å®šåˆ¶åŒ–名称
            {