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

yangle

2025-04-29 6956b68704a297a7f7a5352063442d906e07f648

 WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs

@@ -221,7 +221,7 @@
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "叫料数量大于计划发料数量!";
                            objJsonResult.Message = $"第{(i + 1)}行叫料数量大于计划发料数量!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
@@ -230,7 +230,7 @@
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "叫料总数量大于计划发料数量!";
                            objJsonResult.Message = $"第{(i + 1)}行叫料总数量大于计划发料数量!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
@@ -243,7 +243,7 @@
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "库存数量为0,无法叫料!";
                            objJsonResult.Message = $"第{(i + 1)}行库存数量为0,无法叫料!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
@@ -252,7 +252,7 @@
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "库存数量小于叫料数量,无法叫料!";
                            objJsonResult.Message = $"第{(i + 1)}行库存数量小于叫料数量,无法叫料!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
@@ -261,7 +261,7 @@
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "请选择调入仓库!";
                            objJsonResult.Message = $"第{(i + 1)}行请选择调入仓库!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
@@ -270,7 +270,7 @@
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "请选择调出仓库!";
                            objJsonResult.Message = $"第{(i + 1)}行请选择调出仓库!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
@@ -279,7 +279,7 @@
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "调出仓库和调入仓库不能一样!";
                            objJsonResult.Message = $"第{(i + 1)}行调出仓库和调入仓库不能一样!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
@@ -337,7 +337,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = $"第{txt}行叫料失败，重新叫料，其他行数叫料成功";
                    objJsonResult.Message = $"第{txt}行叫料失败，重新叫料";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -419,6 +419,7 @@
            catch (Exception e)
            {
                sReturn = e.Message;
                oCN.RollBack();
                throw (e);
            }
        }
@@ -772,6 +773,11 @@
                {
                    //拣料配送 下查
                    ds = oCN.RunProcReturn($"exec h_p_JIT_ComplementGoodsBillList_DownQuery '{com.HSouceInterID}',{com.HSourceEntryID}", "h_p_JIT_ComplementGoodsBillList_DownQuery");
                }
                else if (com.Type == 3772)
                {
                    //生产订单 下查 工序流转卡 
                    ds = oCN.RunProcReturn($"select * from h_v_Sc_ProcessExchangeBillQuery where HICMOInterID='{com.HSouceInterID}' and HICMOEntryID={com.HSourceEntryID} and HBillSubType<>'SUB'", "h_v_Sc_ProcessExchangeBillQuery");
                }

                //添加列名
@@ -1157,7 +1163,7 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "叫料数量大于计划发料数量!";
                        objJsonResult.Message = $"第{i + 1}行叫料数量大于计划发料数量!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
@@ -1166,7 +1172,7 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "叫料总数量大于计划发料数量!";
                        objJsonResult.Message = $"第{i + 1}行叫料总数量大于计划发料数量!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
@@ -1223,7 +1229,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = $"第{txt}行叫料失败，重新叫料，其他行数叫料成功";
                    objJsonResult.Message = $"第{txt}行叫料失败，重新叫料";
                    objJsonResult.data = null;
                    return objJsonResult;
                }