1

black-goat-me

2023-04-26 c62b172320283eb2c748f98d434b9ca511f24309

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -176,14 +176,6 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (HEmpID == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "操作员没有选择！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //if (HQCCheckID == 0)
                //{
                //    objJsonResult.code = "0";
@@ -192,14 +184,42 @@
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //if (HSourceID == 0)
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "生产资源没有选择！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                //获取系统参数
                string Ret = "";
                if (oSystemParameter.ShowBill(ref Ret))
                {
                    //判断客户不为龙山汽配
                    if (oSystemParameter.omodel.WMS_CampanyName != "龙山汽配") //系统参数                      
                    {
                        if (HSourceID == 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "生产资源没有选择！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }                                     
                    }
                    //判断客户为龙山汽配
                    else if (oSystemParameter.omodel.WMS_CampanyName == "龙山汽配")
                    {
                        //判断是否为多工位
                        ds = oCN.RunProcReturn("select * from h_v_GetStationOutBill_Detail where 工序ID = " + HProcID + " and 物料ID = " + HMaterID + " and 流转卡号 = '" + HProcExchBillNo + "'", "h_v_GetStationOutBill_Detail");
                        if (ds != null && ds.Tables[0].Rows.Count <= 1)
                        {
                            if (HEmpID == 0)
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "操作员没有选择！";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                        }
                    }
                }
               
                //if (HCenterID == 0)
                //{
                //    objJsonResult.code = "0";
@@ -1641,6 +1661,17 @@
                        return objJsonResult;
                    }

                    ds = oCn.RunProcReturn($"exec h_p_DelOutInBill {HInterID},'MES_StationOutBill_DeleteRelationCtl'", "h_p_DelOutInBill");

                    if (ds.Tables[0].Rows[0][0].ToString()== "0")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "系统参数控制,已有下道工序,不能删除！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

                    //写入删除日志 
                    string WorkList = "删除出站单：" + oBill.omodel.HBillNo;
                    if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HProcExchInterID, oBill.omodel.HProcExchEntryID, ref DBUtility.ClsPub.sExeReturnInfo))