提交

yusijie

2023-06-08 17a8587aea983ef2d2940db6c4e35a03a296ee30

提交

 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs

@@ -343,13 +343,16 @@
            foreach (Gy_RoutingBillSub oSub in DetailColl)
            {
                i++;
                if (oSub.HWorkQty <= 0)
                if (oSystemParameter.omodel.WMS_CampanyName != "龙山汽配")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "第" + i + "行，加工数量不能为0或者小于0";
                    objJsonResult.data = null;
                    return objJsonResult;
                    if (oSub.HWorkQty <= 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "第" + i + "行，加工数量不能为0或者小于0";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                
                //如果工价为0，则工价字段不做为必填字段

 WebAPI/Controllers/LMESController.cs

@@ -425,7 +425,7 @@
                }
                else
                {
                    string sql1 = "select top 1000 * from h_v_Gy_RoutingBillList where 1 = 1 ";
                    string sql1 = "select * from h_v_Gy_RoutingBillList where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by hmainid desc,cast(工序号 as int)";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillList");
                }

 WebAPI/Controllers/POStockInBillController.cs

@@ -1298,7 +1298,7 @@
                    "-",
                    num23.ToString()
                        }));
                        DataSet dataSet16 = clsCN3.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + text1 + "'", "Gy_BarCodeBill");
                        DataSet dataSet16 = clsCN3.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + text1 + "'", "Gy_BarCodeBill"); 
                        bool flag10 = dataSet16.Tables[0].Rows.Count > 0;
                        if (flag10)
                        {
@@ -1323,6 +1323,7 @@
                        }
                        else
                        {
                            //可能和他们的登录组织有关系
                            string billCode3 = "85";
                            long num32 = ClsPub.CreateBillID_Prod(billCode3, ref ClsPub.sExeReturnInfo);
                            long num33 = 0L;
@@ -4307,6 +4308,14 @@
                {
                    DataSet dataSet = this.oCn.RunProcReturn("exec h_p_ReceiveBill_Fast " + hinterID, "h_p_ReceiveBill_Fast");
                    DataRow dataRow = dataSet.Tables[0].Rows[0];
                    if (dataSet.Tables[0].Rows.Count == 1 && dataSet.Tables[0].Rows[0]["FRECEIVENumber"].ToString() == "0")
                    {
                        this.objJsonResult.code = "0";
                        this.objJsonResult.count = 0;
                        this.objJsonResult.Message = "存在多个采购订单单据类型，不允许提交！";
                        this.objJsonResult.data = null;
                        return this.objJsonResult;
                    }
                    bool flag4 = dataSet.Tables[0].Rows.Count <= 0;
                    bool flag5 = flag4;
                    bool flag6 = flag5;