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

chenhaozhe

2026-02-03 02afa11e997bcf6f68d60cc2cfbaa8007f124989

 WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs

@@ -2441,6 +2441,16 @@
            {
                //保存后控制
                objJsonResult = AfterSave_MouldLowerBill(HInterID, HBillNo, 1);
                string sReturn = "";
                if (oSystemParameter.ShowBill(ref sReturn) == true)
                {
                    if (oSystemParameter.omodel.WMS_CampanyName == "华舟")
                    {
                        //自动生成工作联系单
                        oCN.RunProc("exec h_p_OA_WorkLinkBill_Create " + HInterID + "," + 3847);
                    }                   
                }
             
                if (objJsonResult.count == 0)
                {
                    objJsonResult.code = "0";
@@ -2706,5 +2716,43 @@
            }
        }
        #endregion

        #region 上模单扫描工单条码查询对应的器具清单
        [Route("Sc_MouldUpperBill/GetMaterialMouldList")]
        [HttpGet]
        public object GetMaterialMouldList(string sWhere, string user)
        {
            try
            {

                ds = oCN.RunProcReturn("select * from h_v_Gy_MaterialMouldBillMainList_APP where 1 = 1"+sWhere, "h_v_Gy_MaterialMouldBillMainList_APP");

                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未找到当前物料对应的检具清单！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }             
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;  //成功！
                    objJsonResult.Message = "查询成功";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}