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

llj

13 小时以前 a91fdba94705dd25cecccc7a4a5dcc2b3f2c09a6

 WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs

@@ -13202,7 +13202,8 @@
        }
        #endregion

        //转移模块
        #region è½¬ç§»æ¨¡å—
        // è½¬ç§»æ¨¡å—
        [Route("WEBSController/CheckHW")]
        [HttpGet]
        public object CheckHW(int  HWhID,int HSPID,int HWhID2,int HSPID2,string HBarCode,string HCarBarCode1,string HCarBarCode2,string UserID)
@@ -13247,8 +13248,9 @@
                return objJsonResult;
            }
        }
        #endregion

       #region æƒ åº· ç”Ÿäº§é¢†æ–™å•æ ¡éªŒ æ‰«ææºå• èŽ·å–生产领料单和下游领料单未审核 å•æ®
        #region æƒ åº· ç”Ÿäº§é¢†æ–™å•æ ¡éªŒ æ‰«ææºå• èŽ·å–生产领料单和下游领料单未审核 å•æ®
        [Route("WEBSController/get_BillBarCode_BillCheck_Json_MateOut_HuiKang")]
        [HttpGet]
        public Object get_BillBarCode_BillCheck_Json_MateOut_HuiKang(string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID)
@@ -13360,5 +13362,71 @@

        #endregion


        #region æ£€éªŒå• æ‰«ææºå• æ ¹æ®å•æ®ç±»åž‹ æºå•ç±»åž‹ æºå•å· è§£æžå¹¶è¿”回检验项目
        [Route("WEBSController/get_CheckBillBarCode_Json_CheckItem")]
        [HttpGet]
        public Object get_CheckBillBarCode_Json_CheckItem(int HBillType, int HSourceBillType, string HBarCode, string HInterID, string HEntryID, int Mode)
        {
            try
            {
                // Mode = 1 è¡¨ç¤º æ‰«ç æ¨¡å¼ Mode = 2 è¡¨ç¤º é€‰å•æ¨¡å¼
                if(Mode == 1)
                {
                    //扫码模式需要解析条码获取HInterID和HEntryID
                    ds = oCn.RunProcReturn($@"
                    exec h_p_CheckBillBarCode_AnalysisBarcode 
                        @HBillType={HBillType},
                        @HSourceBillType={HSourceBillType},
                        @HBarCode={HBarCode}
                    ", "h_p_CheckBillBarCode_AnalysisBarcode");

                    if (ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "扫描单据条码失败！条码解析失败！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

                    HInterID = ds.Tables[0].Rows[0]["HInterID"].ToString();
                    HEntryID = ds.Tables[0].Rows[0]["HEntryID"].ToString();
                }
                // é€‰å•æ¨¡å¼ç›´æŽ¥é€’å…¥HInterID å’Œ HEntryID æ ¹æ® å–质检方案来源 èŽ·å– æ£€éªŒé¡¹ç›®
                ds = oCn.RunProcReturn($@"
                    exec h_p_CheckBillBarCode_CheckItem 
                        @HBillType={HBillType},
                        @HSourceBillType={HSourceBillType},
                        @HInterID={HInterID},
                        @HEntryID={HEntryID}
                ", "h_p_CheckBillBarCode_CheckItem");

                if(ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "扫描单据条码失败！无绑定质检方案信息";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "success！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "扫描单据条码失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}