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

yusijie

2025-07-16 027401bbe3ab0a557079228c7dd743295ee11e04

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

@@ -5913,6 +5913,7 @@
            string sJXCode = "";
            if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
            {
                string sAutoBarCode = "N";        //免扫物料条码模式（'Y'为不扫物料条码）
                string sSourceBarCodeCtl = "N";   //校验-是否进行源单对应条码核对（'Y'为核对）

                #region ç³»ç»Ÿå‚数获取
@@ -5924,6 +5925,11 @@
                    {
                        sSourceBarCodeCtl = "Y";
                    }
                    //免扫物料条码模式（'Y'为不扫物料条码）
                    if (oSystemParameter.omodel.Kf_POStockInBillCheck_AutoBarCode.ToUpper() == "Y")
                    {
                        sAutoBarCode = "Y";
                    }
                }
                //生产入库单
                if (HBillType == "1202")
@@ -5932,6 +5938,11 @@
                    if (oSystemParameter.omodel.Kf_ProductInBillCheck_SourceBarCodeCtl == "Y")
                    {
                        sSourceBarCodeCtl = "Y";
                    }
                    //免扫物料条码模式（'Y'为不扫物料条码）
                    if (oSystemParameter.omodel.Kf_ProductInBillCheck_AutoBarCode.ToUpper() == "Y")
                    {
                        sAutoBarCode = "Y";
                    }
                }
                //其他入库单
@@ -5942,6 +5953,11 @@
                    {
                        sSourceBarCodeCtl = "Y";
                    }
                    //免扫物料条码模式（'Y'为不扫物料条码）
                    if (oSystemParameter.omodel.Kf_OtherInBillCheck_AutoBarCode.ToUpper() == "Y")
                    {
                        sAutoBarCode = "Y";
                    }
                }
                //领料出库单
                else if (HBillType == "1204")
@@ -5950,6 +5966,11 @@
                    if (oSystemParameter.omodel.Kf_MateOutBillCheck_SourceBarCodeCtl == "Y")
                    {
                        sSourceBarCodeCtl = "Y";
                    }
                    //免扫物料条码模式（'Y'为不扫物料条码）
                    if (oSystemParameter.omodel.Kf_MateOutBillCheck_AutoBarCode.ToUpper() == "Y")
                    {
                        sAutoBarCode = "Y";
                    }
                }
                //销售出库单
@@ -5960,6 +5981,11 @@
                    {
                        sSourceBarCodeCtl = "Y";
                    }
                    //免扫物料条码模式（'Y'为不扫物料条码）
                    if (oSystemParameter.omodel.Kf_SellOutBillCheck_AutoBarCode.ToUpper() == "Y")
                    {
                        sAutoBarCode = "Y";
                    }
                }
                //其他出库单
                else if (HBillType == "1206")
@@ -5968,6 +5994,11 @@
                    if (oSystemParameter.omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl == "Y")
                    {
                        sSourceBarCodeCtl = "Y";
                    }
                    //免扫物料条码模式（'Y'为不扫物料条码）
                    if (oSystemParameter.omodel.Kf_OtherOutBillCheck_AutoBarCode.ToUpper() == "Y")
                    {
                        sAutoBarCode = "Y";
                    }
                }
                //委外领料单
@@ -5978,6 +6009,11 @@
                    {
                        sSourceBarCodeCtl = "Y";
                    }
                    //免扫物料条码模式（'Y'为不扫物料条码）
                    if (oSystemParameter.omodel.Kf_EntrustOutBillCheck_AutoBarCode.ToUpper() == "Y")
                    {
                        sAutoBarCode = "Y";
                    }
                }
                //生产补料单
                else if (HBillType == "1254")
@@ -5986,6 +6022,11 @@
                    if (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl == "Y")
                    {
                        sSourceBarCodeCtl = "Y";
                    }
                    //免扫物料条码模式（'Y'为不扫物料条码）
                    if (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_AutoBarCode.ToUpper() == "Y")
                    {
                        sAutoBarCode = "Y";
                    }
                }
                //委外补料单
@@ -5996,6 +6037,11 @@
                    {
                        sSourceBarCodeCtl = "Y";
                    }
                    //免扫物料条码模式（'Y'为不扫物料条码）
                    if (oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_AutoBarCode.ToUpper() == "Y")
                    {
                        sAutoBarCode = "Y";
                    }
                }
                //直接调拨单
                else if (HBillType == "1207")
@@ -6004,6 +6050,11 @@
                    if (oSystemParameter.omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl == "Y")
                    {
                        sSourceBarCodeCtl = "Y";
                    }
                    //免扫物料条码模式（'Y'为不扫物料条码）
                    if (oSystemParameter.omodel.Kf_MoveStockBillCheck_AutoBarCode.ToUpper() == "Y")
                    {
                        sAutoBarCode = "Y";
                    }
                }
                #endregion
@@ -6018,8 +6069,17 @@
                }
                try
                {
                    //免扫物料条码模式（'Y'为不扫物料条码）
                    if (sAutoBarCode == "Y")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "免扫物料条码模式，无需扫描物料条码！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //原单据为扫码生成，校验时不生成条码记录，只对原扫描的条码进行核对
                    if (sSourceBarCodeCtl == "Y")
                    else if (sSourceBarCodeCtl == "Y")
                    {
                        WebSoBar = oWebs.get_BillBarCode_Verify(HBillID, HBillNo, HBillType, sJXCode, HQty, HMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
                        if (WebSoBar == null)