jhz
2022-08-15 5ebe0fbb0bc1eec74a7e1b81b1eddcb9d97ba799
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
2个文件已修改
20 ■■■■■ 已修改文件
WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs
@@ -232,14 +232,14 @@
                            return objJsonResult;
                        }
                        if (listCa[i].调出仓库可用库存数量 == 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "调出仓库可用库存数量为0!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //if (listCa[i].调出仓库可用库存数量 == 0)
                        //{
                        //    objJsonResult.code = "0";
                        //    objJsonResult.count = 0;
                        //    objJsonResult.Message = "调出仓库可用库存数量为0!";
                        //    objJsonResult.data = null;
                        //    return objJsonResult;
                        //}
                        j = 1;
WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs
@@ -64,7 +64,7 @@
                ds = oCN.RunProcReturn($"exec h_p_JIT_ComplementGoodsBillList_Query '{com.MaterialNumber}','{com.MaterialName}','{com.MaterialModel}','{com.HGD}'," +
                    $"'{com.HWHName}','{com.HDeptName}','{com.Organization}','{com.user}','{com.HJLStatus}','{com.HBeginDate}','{com.HEndDate}'", "h_p_JIT_ComplementGoodsBillList_Query");
                //bool a = AddSendGoodsBillSynChronizAtion("PLD00000112", ref DBUtility.ClsPub.sExeReturnInfo);
                //bool a = AddSendGoodsBillSynChronizAtion("PLD00000114", ref DBUtility.ClsPub.sExeReturnInfo);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
@@ -422,6 +422,8 @@
                FentityModel.Add("FKeeperId", new JObject() { ["Fnumber"] = dr["FKeeperId"].ToString() });
                FentityModel.Add("FKeeperTypeOutId", dr["FKeeperTypeOutId"].ToString());
                FentityModel.Add("FKeeperOutId", new JObject() { ["Fnumber"] = dr["FKeeperOutId"].ToString() });
                FentityModel.Add("FDestStockId", new JObject() { ["Fnumber"] = dr["FDestStockId"].ToString() });
                FentityModel.Add("FSrcStockId", new JObject() { ["Fnumber"] = dr["FSrcStockId"].ToString() });
                FentityModel.Add("FQty", dr["FQty"].ToString());
                Fentity.Add(FentityModel);