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

chenhaozhe

1 天以前 c46b3b47dbada2e5e35df06e47ea1e4537eaa948

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

 WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs

@@ -2600,7 +2600,7 @@
        {
            //sCloudMode：系统参数  æ˜¯å¦ä¸ºç§æœ‰äº‘模式(N为公有云模式，Y为私有云模式)；
            //sERPMode：系统参数  åº“存控制-WMS库存控制ERP模式    (WISE、CLOUD、MES)；
            //sHType：值 1 å¯¹åº”缓存列表删除；值 2 å¯¹åº”已上传撤销；
            //sHType：值 1 å¯¹åº”缓存列表删除；值 2 å¯¹åº”已上传撤销；值 3 å¯¹åº”校验模块已上传撤销；

            //公有云模式
            if (sCloudMode == "N")
@@ -2738,7 +2738,7 @@
                    var sJson = new
                    {
                        FormId = sFormId,
                        FieldKeys = "FBillNo",
                        FieldKeys = "FBillNo,FAPPROVERID",
                        FilterString = $@"FBillNo='{HBillNo}'",
                        OrderString = "",
                        TopRowCount = 0,
@@ -2770,7 +2770,7 @@
                            }
                        }
                        //sHType = 2对应已上传撤销
                        else
                        else if(sHType == 2)
                        {
                            //判断返回的数组数据中是否存在"false"，存在代表递入的业务对象表单Id不正确
                            if (_saveObj[0][0].ToString().Contains("false") == true)
@@ -2784,10 +2784,56 @@
                                return false;
                            }
                        }
                        //sHType = 3对应校验模块已上传撤销
                        else if (sHType == 3)
                        {
                            //判断返回的数组数据中是否存在"false"，存在代表递入的业务对象表单Id不正确
                            if (_saveObj[0][0].ToString().Contains("false") == true)
                            {
                                sErrMsg = "此模块暂不支持撤销功能！";
                                return false;
                            }
                            else if (_saveObj[0][1].ToString() != "0")
                            {
                                sErrMsg = "校验撤销单据失败，单据号：" + HBillNo + "，金蝶云里已审核，不允许撤销！";
                                return false;
                            }
                            else
                            {
                                return true;
                            }
                        }
                        else
                        {
                            sErrMsg = "sHType值递入错误！";
                            return false;
                        }
                    }
                }
            }
            //私有云模式
            else
            {
                //sHType = 3    æ‰«ç æ ¡éªŒæ¨¡å—
                if (sHType == 3)
                {
                    ds = oCn.RunProcReturn("exec h_p_WMS_BillQuery_BillCheck " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + sERPMode + "'", "h_p_WMS_BillQuery_BillCheck");
                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        sErrMsg = "单据查询发生错误！";
                        return false;
                    }
                    else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
                    {
                        sErrMsg = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
                        return false;
                    }
                    else
                    {
                        return true;
                    }
                }
                //sHType = 1 æˆ– sHType = 2   æ‰«ç æ–°å¢žæ¨¡å—
            else
            {
                ds = oCn.RunProcReturn("exec h_p_WMS_BillQuery " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + sERPMode + "'," + sHType.ToString(), "h_p_WMS_BillQuery");
@@ -2804,6 +2850,7 @@
                else
                {
                    return true;
                    }
                }
            }
        }
@@ -9456,6 +9503,16 @@
                }
                #endregion

                //撤销前判断金蝶云中单据是否存在
                if (!GetBillQuery_WMS(HInterID, HBillNo, HBillType, HMaker, oSystemParameter.omodel.WMS_CloudMode, sERPMode, 3, ref sErrMsg))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = sErrMsg;
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                try
                {
                    oCn.BeginTran();