Merge branch 'master' into Liudl

bklLiudl

2024-09-02 1b86f1120560fbfcad792606064a9bef15d42827

 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs

@@ -1902,16 +1902,17 @@
                                        BoxNo, 
                                        SkuNo,
                                        SkuName, 
                                        LotNo, 
                                        LotNo,
                                        BitBoxMark,
                                        SUM(Qty) as Qty 
                                      FROM BllBoxInfo 
                                      WHERE IsDel = '0' 
                                        AND Status='0'  
                                        AND BoxNo = '{model.BoxNo}'
                                      GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo; ";
                                      GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
                var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);

                if (models == null)
                if (models.Count == 0 )
                {
                    throw new Exception("箱码信息不存在!");
                }
@@ -1923,6 +1924,55 @@
                throw ex;
            }
        }

        /// <summary>
        /// 根据箱码向追溯系统请求标签箱码信息
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public List<BoxInfoDto> GetFMBindBoxInfos(string boxno)
        {
            try
            {
                #region 箱码请求接口，正式系统放开
                /*var jsonData = JsonConvert.SerializeObject(boxno);

                var response = HttpHelper.DoPost(url, jsonData, "箱码信息请求", "FM");

                var obj = JsonConvert.DeserializeObject<ErpModel>(response);//解析返回数据
                if (obj.Success != 0)
                {
                    throw new Exception("请求失败" + obj.Message);
                }*/
                #endregion
                string sqlString = $@"SELECT 
                                        ASNNo,
                                        BoxNo, 
                                        SkuNo,
                                        SkuName, 
                                        LotNo,
                                        BitBoxMark,
                                        SUM(Qty) as Qty 
                                      FROM BllBoxInfo 
                                      WHERE IsDel = '0' 
                                        AND Status='0'  
                                        AND BoxNo = '{boxno}'
                                      GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
                var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);  // response

                if (models.Count == 0)
                {
                    throw new Exception("箱码信息不存在!");
                }

                return models;
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }

        // 根据单据号获取单据明细列表
        public List<ArrivalNoticeDetailDto> GetBindArrivalNoticeDetails(ArrivalNoticeVm model)
        {