解决冲突

bklLiudl

2024-08-23 62b3bf8205277b9bdceaa83f0d7e5d73312e1780

 Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs

@@ -51,13 +51,13 @@
        void BindPalletByJc23(PdaPalletBindVm model, int userId, string origin);

        //JC23绑定物料托盘即增加库存
        public void BindPalletStock(PdaPalletBindVm model, int userId, string origin);
        void BindPalletStock(PdaPalletBindVm model, int userId, string origin);

        /// <summary>
        /// JC26绑定托盘 贴标物料
        /// </summary>
        /// <param name="model"></param>
        /// <param name="userId"></param>
        ///// <summary>
        ///// JC26绑定托盘 贴标物料
        ///// </summary>
        ///// <param name="model"></param>
        ///// <param name="userId"></param>
        void BindPalletPasteCode(PdaPalletBindVm model, int userId);

        /// <summary>