Merge branch 'wxw'

wxw

9 小时以前 f3a9a3ad429d86028c884e3476dc0badcd8da966

Merge branch 'wxw'

 HTML/views/ASNSetting/LabelPrintSelect.html

@@ -122,11 +122,11 @@
                    });

                    var id = getQueryString('Id');
                    var SupplierLot=getQueryString('SupplierLot');//供货批次
                    $('#SupplierLot').val(SupplierLot);
                    if(SupplierLot!='' && SupplierLot!=null &&SupplierLot!=undefined){
                        $('#SupplierLot').attr('readonly', 'readonly');
                    }
                    // var SupplierLot=getQueryString('SupplierLot');//供货批次
                    // $('#SupplierLot').val(SupplierLot);
                    // if(SupplierLot!='' && SupplierLot!=null &&SupplierLot!=undefined){
                    //     $('#SupplierLot').attr('readonly', 'readonly');
                    // }
                    var asnType = getQueryString('Type');
                    console.log(asnType);
                    // console.log(asnType == 4);
@@ -143,7 +143,11 @@
                     
                    synData(IP + "/BllAsn/GetAsnDetailQtyList", param , 'get', function (res) {
                        if (res.code == 0) { //成功  
                            $("#arriveQty").val(res.data);
                            $("#arriveQty").val(res.data.Qty);
                            $("#productionTime").val(res.data.ProductionTime);
                            $("#expirationTime").val(res.data.ExpirationTime);
                            $("#storeTime").val(res.data.StoreTime);
                            $("#SupplierLot").val(res.data.SupplierLot);
                        } else { //不成功
                            layer.msg(res.msg, {
                                icon: 2,

 Wms/Model/ModelDto/BllAsnDto/LabelPrintInfoDto.cs

New file
@@ -0,0 +1,31 @@
using System;
using System.Collections.Generic;
using System.Text;

namespace Model.ModelDto.BllAsnDto
{
    public class LabelPrintInfoDto
    {
        /// <summary>
        /// 剩余打印的数量
        /// </summary>
        public string Qty { get; set; }
        /// <summary>
        /// 生产日期
        /// </summary>
        public string ProductionTime { get; set; }
        /// <summary>
        /// 有效期
        /// </summary>
        public string ExpirationTime { get; set; }
        /// <summary>
        /// 储存期至
        /// </summary>
        public string StoreTime { get; set; }

        /// <summary>
        /// 供货批次
        /// </summary>
        public string SupplierLot { get; set; }
    }
}

 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs

@@ -1,5 +1,6 @@
using Model.InterFaceModel;
using Model.ModelDto;
using Model.ModelDto.BllAsnDto;
using Model.ModelDto.SysDto;
using Model.ModelVm;
using Model.ModelVm.SysVm;
@@ -138,7 +139,7 @@
        }

        //获取入库单明细剩余打印数量
        public string GetAsnDetailQtyList(int id)
        public LabelPrintInfoDto GetAsnDetailQtyList(int id)
        {
            try
            {
@@ -147,7 +148,11 @@
                {
                    throw new Exception("未查询到入库单明细");
                }
                var data = new LabelPrintInfoDto();

                data.ProductionTime = string.IsNullOrEmpty(detail.Lot1) ? "" : Convert.ToDateTime(detail.Lot1).ToString("yyyy-MM-dd");
                data.ExpirationTime = string.IsNullOrEmpty(detail.Lot2) ? "" : Convert.ToDateTime(detail.Lot2).ToString("yyyy-MM-dd");
                data.SupplierLot = detail.SupplierLot;
                var labelQty = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.ASNDetailNo == id).Sum(m => m.Qty + (m.SamplingQty == null? 0: m.SamplingQty));
                if (labelQty == null)
                {
@@ -158,7 +163,8 @@
                {
                    qty = 0;
                }
                return qty.ToString();
                data.Qty = qty.ToString();
                return data;
            }
            catch (Exception e)
            {

 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs

@@ -3034,7 +3034,7 @@
                    foreach (var item in list)
                    {
                        var outModeLocate = "";
                        if (outMode == "1")
                        if (outMode == "17")
                        {
                            if (i < outLocatelist1.Count)
                            {
@@ -3047,7 +3047,7 @@
                                outModeLocate = outLocatelist1[j].LocatNo;
                            }
                        }
                        else if(outMode == "2")
                        else if (outMode == "18")
                        {
                            if (i < outLocatelist1.Count)
                            {
@@ -3060,6 +3060,10 @@
                                outModeLocate = outLocatelist2[j].LocatNo;
                            }
                        }
                        else
                        {
                            throw new Exception("出库口工位异常");
                        }
                        
                        var taskNoStr = "";
                                           

 Wms/WMS.IBLL/IBllAsnServer/IArrivalNoticeServer.cs

@@ -1,5 +1,6 @@
using Model.InterFaceModel;
using Model.ModelDto;
using Model.ModelDto.BllAsnDto;
using Model.ModelDto.SysDto;
using Model.ModelVm;
using Model.ModelVm.SysVm;
@@ -34,7 +35,7 @@
        /// </summary>
        /// <param name="id">id</param> 
        /// <returns></returns>
        string GetAsnDetailQtyList(int id);
        LabelPrintInfoDto GetAsnDetailQtyList(int id);

        /// <summary>
        /// 获取物料信息（添加入库单明细使用）