1

wangyi

2026-02-28 122f94430924e090600daaac28183bd1daeedc14

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

@@ -1454,7 +1454,7 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if(DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
                if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -2642,7 +2642,7 @@
                        TopRowCount = 0,
                        StartRow = 0,
                        Limit = 0
                    };;
                    }; ;
                    var _result = InvokeHelper.Query(sFormId, JsonConvert.SerializeObject(sJson));
                    var _saveObj = JArray.Parse(_result);

@@ -3353,6 +3353,10 @@
                else if (lsmain[0].HMainSourceBillType == "3710")
                {
                    websLsmain.HMainSourceBillType = "生产订单";
                }
                else if (lsmain[0].HMainSourceBillType == "1256")
                {
                    websLsmain.HMainSourceBillType = "生产领料申请单";
                }
                else
                {
@@ -5295,7 +5299,7 @@
            try
            {

                DataSet ds=oCn.RunProcReturn($"select * from h_v_get_PackUnionBill where æ ˆæ¿ç ='{HBarCode_Pack}'", "h_v_get_PackUnionBill");
                DataSet ds = oCn.RunProcReturn($"select * from h_v_get_PackUnionBill where æ ˆæ¿ç ='{HBarCode_Pack}'", "h_v_get_PackUnionBill");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
@@ -5540,7 +5544,7 @@
                {

                    //删除前控制=========================================
                    DataSet dds = oCn.RunProcReturn("Exec h_p_KF_ICInventory_WorkShop_BeforeDelCtrl " + mainList[0].HInterID.ToString()  , "h_p_KF_ICInventory_WorkShop_BeforeDelCtrl");
                    DataSet dds = oCn.RunProcReturn("Exec h_p_KF_ICInventory_WorkShop_BeforeDelCtrl " + mainList[0].HInterID.ToString(), "h_p_KF_ICInventory_WorkShop_BeforeDelCtrl");

                    if (dds == null)
                    {
@@ -7856,7 +7860,7 @@

                #region ç³»ç»Ÿå‚数获取
                //生产领料单-先进先出控制
                if (HBillType == "1204" 
                if (HBillType == "1204"
                    && oSystemParameter.omodel.Kf_MateOutBillCheck_AutoBarCode.ToUpper() == "N"         //免扫物料条码模式（'Y'为不扫物料条码）
                    && oSystemParameter.omodel.Kf_MateOutBillCheck_SourceBarCodeCtl.ToUpper() == "N"    //校验-是否进行源单对应条码核对（'Y'为核对）
                    && (oSystemParameter.omodel.Kf_MateOutBillCheck_FIFOCtl == "1" || oSystemParameter.omodel.Kf_MateOutBillCheck_FIFOCtl == "2" || oSystemParameter.omodel.Kf_MateOutBillCheck_FIFOCtl == "3"))
@@ -8671,7 +8675,7 @@
        {
            try
            {
                ds = oCn.RunProcReturn("exec h_p_WMS_GetCheckBillList '" + HBillType  + "'," + HStockOrgID.ToString() + ",'" + HBillNo + "','" + HMater + "','" + HCustom + "'", "h_p_WMS_GetCheckBillList");
                ds = oCn.RunProcReturn("exec h_p_WMS_GetCheckBillList '" + HBillType + "'," + HStockOrgID.ToString() + ",'" + HBillNo + "','" + HMater + "','" + HCustom + "'", "h_p_WMS_GetCheckBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
@@ -8815,7 +8819,7 @@
        #endregion

        #region ç”Ÿäº§ç»„托单模块 æ‰«æå®¢æˆ·ç®±ï¼ˆæ‰˜ï¼‰æ¡ç  -凯贝装箱单     20251103
        

        [Route("WEBSController/Get_PackBarCode_PackUnionBill_New_Json_Cus")]
        [HttpGet]
        public object Get_PackBarCode_PackUnionBill_New_Json_Cus(Int64 HInterID, string HBillNo, string HBillType, string HBillSubType, string HBarCode_Pack, string HSourceBillNo)
@@ -9303,9 +9307,9 @@
        #region æ ¹æ®sn码寻找对应的中箱码
        [Route("WEBSController/getMiddleCodeBySn")]
        [HttpGet]
        public object getMiddleCodeBySn(string HBarCode,int HStockOrgID)
        public object getMiddleCodeBySn(string HBarCode, int HStockOrgID)
        {
            DataSet dss = oCn.RunProcReturn("select * from Gy_CaseCodeRelation where HBarCode='"+ HBarCode + "'", "Gy_CaseCodeRelation");
            DataSet dss = oCn.RunProcReturn("select * from Gy_CaseCodeRelation where HBarCode='" + HBarCode + "'", "Gy_CaseCodeRelation");

            if (dss.Tables[0].Rows[0]["HCaseCode"].ToString() == "" || dss == null)
            {
@@ -13874,11 +13878,11 @@
        /// <returns></returns>
        [Route("WEBSController/BindCarAndWH")]
        [HttpGet]
        public object BindCarAndWH( string HMaker, Int64 HWhID, Int64 HSPID, string HCarBarCode, Int64 HStockOrgID,int bindsignal)
        public object BindCarAndWH(string HMaker, Int64 HWhID, Int64 HSPID, string HCarBarCode, Int64 HStockOrgID, int bindsignal)
        {
            try
            {
                ds = oCn.RunProcReturn("exec h_p_bindingCarintoWh "  + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HCarBarCode + "','" + HMaker+ "'," + HStockOrgID.ToString()+","+ bindsignal, "h_p_bindingCarintoWh");
                ds = oCn.RunProcReturn("exec h_p_bindingCarintoWh " + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HCarBarCode + "','" + HMaker + "'," + HStockOrgID.ToString() + "," + bindsignal, "h_p_bindingCarintoWh");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
@@ -13922,7 +13926,7 @@
        // è½¬ç§»æ¨¡å—
        [Route("WEBSController/CheckHW")]
        [HttpGet]
        public object CheckHW(int  HWhID,int HSPID,int HWhID2,int HSPID2,string HBarCode,string HCarBarCode1,string HCarBarCode2,string UserID)
        public object CheckHW(int HWhID, int HSPID, int HWhID2, int HSPID2, string HBarCode, string HCarBarCode1, string HCarBarCode2, string UserID)
        {
            try
            {
@@ -13971,7 +13975,7 @@
        [HttpGet]
        public Object get_BillBarCode_BillCheck_Json_MateOut_HuiKang(string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID)
        {
           

            try
            {
                WebSoBar = null;
@@ -13983,7 +13987,7 @@
                List<string> HBillNoList = new List<string>();
                foreach (DataRow row in ds.Tables[0].Rows)
                {
                    if (string.IsNullOrWhiteSpace(row["HChecker"].ToString())){
                    if (string.IsNullOrWhiteSpace(row["HChecker"].ToString())) {
                        // 2. åˆ¤æ–­å•æ®å®¡æ ¸çŠ¶æ€ï¼ŒæŸ¥æ‰¾æœªè¢«å®¡æ ¸çš„单据
                        WebSoBar = oWebs.get_BillBarCode_BillCheck(row["HBillNo"].ToString(), HBillType, row["HMaker"].ToString(), HStockOrgID, ref DBUtility.ClsPub.sErrInfo);

@@ -14038,7 +14042,7 @@
        {
            try
            {
              

                string sql = $"exec [h_p_Sc_ICMOBillWorkQtyStatus_Save] {HInterID}";
                ds = oCn.RunProcReturn(sql, "[h_p_Sc_ICMOBillWorkQtyStatus_Save]");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -14081,14 +14085,14 @@
        #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,string user)
        public Object get_CheckBillBarCode_Json_CheckItem(int HBillType, int HSourceBillType, string HBarCode, string HInterID, string HEntryID, int Mode, string user)
        {
            try
            {
                string sErrMsg = "";
                oSystemParameter.ShowBill(ref sErrMsg);
                // åŽèˆŸå®¢æˆ·
                if(oSystemParameter.omodel.WMS_CampanyName == "华舟")
                if (oSystemParameter.omodel.WMS_CampanyName == "华舟")
                {
                    HBarCode = HBarCode.Split('-')[0];
                }
@@ -14126,13 +14130,32 @@
                        @HEntryID={HEntryID}
                ", "h_p_CheckBillBarCode_CheckItem");

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

                if (oSystemParameter.omodel.WMS_CampanyName == "华舟")
                {
                    if (HBillType == 7507) // å•æ®ç±»åž‹æ˜¯æœ«ä»¶æ£€éªŒå• æŸ¥æ‰¾å•æ®æ˜¯å¦é‡å¤ï¼Œæ£€éªŒæ˜¯å¦åˆæ ¼ï¼Œå•æ®é‡å¤éœ€è¦è¿”回不同的状态
                    {
                        var ds2 = oCn.RunProcReturn($"select top 1 * from QC_ProcessCheckBillMain where HMainSourceBillNo = '{HBarCode}' order by HDate desc", "QC_ProcessCheckBillMain");
                        if (ds2.Tables[0].Rows.Count > 0)
                        {
                            if (ds2.Tables[0].Rows[0]["HCheckerResult"].ToString() == "true") // æ£€éªŒåˆæ ¼æç¤ºæ˜¯å¦éœ€è¦æ–°å¢ž
                            {
                                objJsonResult.code = "2"; // è¿”回Code为2表示单据重复，需要提示是否需要新增单据
                                objJsonResult.count = 1;
                                objJsonResult.Message = "success！";
                                objJsonResult.data = ds.Tables[0];
                                return objJsonResult;
                            }
                        }
                    }
                }

                objJsonResult.code = "1";
@@ -14201,14 +14224,14 @@
        #endregion

        #region æ·»åº·æ ¹æ®å°è½¦æ¡ç æ‰¾å‡ºç›¸åº”物料
        

        [Route("WEBSController/GetMaterIDByCarBarCode")]
        [HttpGet]
        public object GetMaterIDByCarBarCode(string CarBarCode)
        {
            try
            {
                ds = oCn.RunProcReturn("select * from GetMaterMesByCarBarCode where HQty>=0 and å°è½¦='" + CarBarCode.ToString() + "'" , "GetMaterMesByCarBarCode");
                ds = oCn.RunProcReturn("select * from GetMaterMesByCarBarCode where HQty>=0 and å°è½¦='" + CarBarCode.ToString() + "'", "GetMaterMesByCarBarCode");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
@@ -14285,5 +14308,224 @@
            }
        }
        #endregion

        #region è£…箱追溯

        #region [装箱追溯] æ‰«æSN条码
        [Route("WEBSController/get_SNBarCode_PackUnionCarryUp")]
        [HttpGet]
        public object get_SNBarCode_PackUnionCarryUp(string sHBarCode, int sInterID, string HBillType, string sBillNo, string sHBarCode_Pack, string sMaker, int HStockOrgID)
        {
            if (oWebs.get_SNBarCode_PackUnionCarryUp(sHBarCode, sInterID, HBillType, sBillNo, sHBarCode_Pack, sMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //成功！
                objJsonResult.data = null;
                return objJsonResult;
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //失败！
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region [装箱追溯] æ‰«æç®±æ¡ç 
        [Route("WEBSController/get_BarCode_PackUnionCarryUp")]
        [HttpGet]
        public object get_BarCode_PackUnionCarryUp(int sInterID, string HBillType, string sBillNo, string sHBarCode_Pack, string sMaker, int HStockOrgID)
        {
            var oBar = oWebs.get_BarCode_PackUnionCarryUp(sInterID, HBillType, sBillNo, sHBarCode_Pack, sMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
            if (oBar == null)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //成功！
                objJsonResult.data = null;
                return objJsonResult;
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //失败！
                objJsonResult.data = oBar;
                return objJsonResult;
            }
        }
        #endregion

        #region [装箱追溯] èŽ·å–表体物料信息
        [Route("WEBSController/GetBillEntry_TmpList_PackUnionCarryUp")]
        [HttpGet]
        public object GetBillEntry_TmpList_PackUnionCarryUp(int sInterID, string HBillType, string sBillNo, int HStockOrgID)
        {
            DataSet oDs = oWebs.GetBillEntry_TmpList_PackUnionCarryUp(sInterID, sBillNo, HBillType, ref DBUtility.ClsPub.sErrInfo);
            if (oDs == null || oDs.Tables[0].Rows.Count == 0)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //失败！
                objJsonResult.data = null;
                return objJsonResult;
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //成功！
                objJsonResult.data = oDs.Tables[0];
                return objJsonResult;
            }
        }
        #endregion

        #region [装箱追溯] åˆ é™¤
        [Route("WEBSController/set_DelPackUnionBill_Temp_Pack")]
        [HttpGet]
        public object set_DelPackUnionBill_Temp_Pack(int HInterID)
        {
            if (oWebs.DeleteTemp_PackUnionBill(HInterID, ref DBUtility.ClsPub.sErrInfo))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //成功！
                objJsonResult.data = null;
                return objJsonResult;
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //失败！
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region [装箱追溯] ä¸Šä¼ ç”Ÿå•
        [Route("WEBSController/set_SavePackUnionCarryUpBill")]
        [HttpPost]
        public object set_SavePackUnionCarryUpBill(string ModRightNamePackUnionCarryUp, int sInterID,
                                                    string HBillType, string sBillNo, string sHBarCode_Pack,
                                                    string sMaker, int HStockOrgID)
        {
            if (!oWebs.CheckModRight(ModRightNamePackUnionCarryUp, DBUtility.ClsPub.CurUserName, ref DBUtility.ClsPub.sErrInfo))
            {
                // é‰´æƒ
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "鉴权失败，该用户无权限上传单据! ";  //失败！
                objJsonResult.data = null;
                return objJsonResult;
            }
            else
            {
                if(oWebs.set_SavePackUnionCarryUpBill_New(sInterID, HBillType, sBillNo, sHBarCode_Pack, sMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "生成生产装箱追溯单成功！单据号为：" + sBillNo;  //成功！
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "生成失败！原因:" + DBUtility.ClsPub.sErrInfo;  //成功！
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
        }
        #endregion

        #region [装箱追溯] ç¼–辑缓存列表单据
        [Route("WEBSController/TempList_Modify_Pack")]
        [HttpGet]
        public object TempList_Modify_Pack(Int64 HInterID, string HBillNo, string HBillType)
        {
            if(oWebs.TempList_Modify_Pack(HInterID,  HBillNo,  HBillType, ref DBUtility.ClsPub.sErrInfo))
            {
                // æˆåŠŸ (无已上传记录)
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo; 
                objJsonResult.data = null;
                return objJsonResult;

            }
            else
            {
                // å¤±è´¥
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //失败！
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region [装箱追溯] èŽ·å–缓存列表
        [Route("WEBSController/GetSc_PackUnionBill_TempList_Pack")]
        [HttpGet]
        public object GetSc_PackUnionBill_TempList(string HBillType, string HMaker, Int64 HStockOrgID)
        {
            DataSet oDs = oWebs.GetSc_PackUnionBill_TempList(HBillType, HMaker, HStockOrgID);
            if(oDs == null)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //失败！
                objJsonResult.data = null;
                return objJsonResult;
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //成功！
                objJsonResult.data = oDs.Tables[0];
                return objJsonResult;
            }
        }
        #endregion

        #region [装箱追溯] åˆ é™¤ç¼“存列表单据
        [Route("WEBSController/DeleteTemp_PackUnionBill_Pack")]
        [HttpGet]
        public object DeleteTemp_PackUnionBill_Pack(Int64 HInterID)
        {
            if(oWebs.DeleteTemp_PackUnionBill(HInterID, ref DBUtility.ClsPub.sErrInfo))
            {
                // åˆ é™¤æˆåŠŸ
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo; 
                objJsonResult.data = null;
                return objJsonResult;

            }
            else
            {
                // åˆ é™¤å¤±è´¥
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #endregion
    }
}