JC24WMS.git - Gitblit

parent: 86985a3e | 补丁 | 提交 | ignore whitespace

chengsc

2024-10-16 98671d2b1473b1e3e55abbdd3304fc3cd8c33959

修改问题

4个文件已修改

	Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs	33 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/Wms/CreateBoxInfo.json	84 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs

@@ -2552,8 +2552,13 @@
                            detailModel.SupplierName = notice.CustomerName;//供应商名称
                        }
                        #region  维护质检结果
                        
                        //获取该批次最终质检结果
                        var quality = Db.Queryable<BllQualityInspect>().Where(a => a.LotNo == noticeDetail.LotNo && a.IsDel == "0").OrderByDescending(a => a.CreateTime).First();
                        if (notice.Type == "3")
                        {
                            quality = Db.Queryable<BllQualityInspect>().Where(a => a.LotNo == noticeDetail.LotNo && a.ASNNo == notice.ASNNo && a.IsDel == "0").OrderByDescending(a => a.CreateTime).First();
                        }
                        if (quality != null)
                        {
                            //修改合格不合格数量

 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs

@@ -539,7 +539,7 @@
                {
                    var biaoShi = "0";//0：整箱拣货、1：散支拣货、2：数量拣货
                    List<DataBoxInfo> boxInfos;
                    var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);
                    var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo && m.StockDetailId == stockDetail.Id);
                    if (boxInfo.Count() == 0)
                    {
                        throw new Exception("未查询到该箱码及追溯码的信息");
@@ -653,6 +653,7 @@

                        if (biaoShi != "2")
                        {
                            pickQty += item.Qty;
                            //删除库存箱码明细
                            Db.Deleteable(item).ExecuteCommand();
                        }
@@ -660,17 +661,20 @@
                        {
                            if (decimal.Parse(pickQty1) == item.Qty)
                            {
                                pickQty += item.Qty;
                                //删除库存箱码明细
                                Db.Deleteable(item).ExecuteCommand();
                                
                            }
                            else
                            {
                                pickQty += decimal.Parse(pickQty1);
                                item.Qty -= decimal.Parse(pickQty1);
                                item.BitBoxMark = "1";//零箱标识
                                Db.Updateable(item).ExecuteCommand();
                            }
                        }
                        pickQty += item.Qty;
                        
                    }
                    //改变库内箱码是否零箱信息
                    if (biaoShi == "1")
@@ -3230,6 +3234,7 @@

                        if (biaoShi != "2")
                        {
                            pickQty += item.Qty;
                            //删除库存箱码明细
                            Db.Deleteable(item).ExecuteCommand();
                        }
@@ -3237,17 +3242,19 @@
                        {
                            if (decimal.Parse(pickQty1) == item.Qty)
                            {
                                pickQty += item.Qty;
                                //删除库存箱码明细
                                Db.Deleteable(item).ExecuteCommand();
                            }
                            else
                            {
                                pickQty += decimal.Parse(pickQty1);
                                item.Qty -= decimal.Parse(pickQty1);
                                item.BitBoxMark = "1";//零箱标识
                                Db.Updateable(item).ExecuteCommand();
                            }
                        }
                        pickQty += item.Qty;
                        
                    }
                    //改变库内箱码是否零箱信息
                    if (biaoShi == "1")
@@ -4265,7 +4272,7 @@
                                        PalletNo3 = item.PalletNo3,
                                        Qty = decimal.Parse(pickQty1),
                                        FullQty = item.FullQty,
                                        Status = "4",
                                        Status = "5",
                                        LotNo = item.LotNo,
                                        LotText = item.LotText,
                                        SkuNo = item.SkuNo,

 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs

@@ -3239,10 +3239,41 @@
                        throw new Exception("获取失败，出库单状态不允许!");
                    }
                }
                   
                string inspectStatus = string.Empty;
                switch (notice.Type)//0：原料 1：包材 2：成品 3：耗材 4：半成品
                {
                    case "0"://成品出库
                        inspectStatus = "1";
                        break;
                    case "1"://领料出库
                        inspectStatus = "1";
                        break;
                    case "2"://抽检出库
                        inspectStatus = "0,1,2";
                        break;
                    case "3"://物料取样出库
                        inspectStatus = "0";
                        break;
                    case "4"://不合格品出库
                        inspectStatus = "2";
                        break;
                    case "5"://中间品出库
                        inspectStatus = "1";
                        break;
                    case "6"://代储出库
                        inspectStatus = "0,1,2";
                        break;
                    case "8"://寄存出库
                        inspectStatus = "0,1";
                        break;
                    default: //其它出库
                        inspectStatus = "0,1";
                        break;
                }
                #endregion

                Expression<Func<DataStockDetail, bool>> item = Expressionable.Create<DataStockDetail>()
                    .AndIF(!string.IsNullOrWhiteSpace(inspectStatus), m => inspectStatus.Contains(m.InspectStatus))
                    .AndIF(!string.IsNullOrWhiteSpace(houseNo), m => m.WareHouseNo == houseNo)
                    .AndIF(!string.IsNullOrWhiteSpace(roadwayNo), m => m.RoadwayNo == roadwayNo)
                    .AndIF(!string.IsNullOrWhiteSpace(locateNo), m => m.LocatNo == locateNo)

 Wms/Wms/CreateBoxInfo.json

@@ -1,48 +1,48 @@
[
  {
    "OrderCode": "", //明细生产单据号
    "BoxNo": "B2408190001000001", //箱号
    "BoxNo2": "", //盒号
    "BoxNo3": "Z24081900010001", //支号
    "Qty": 1, //数量
    "FullQty": 2, //满箱数量
    "SkuNo": "00001", //物料编码
    "SkuName": "测试物料1", //物料名称
    "LotNo": "CPPC240818001", //批次
    "LotText": "", //批次描述
    "SupplierLot":"GH240818001",
    "ProductionTime": "2024-08-19T02:16:45.301Z", //生产日期
    "ExpirationTime": "2025-08-19T02:16:45.301Z", //过期日期
    "InspectMark": "0", //检验/抽检 标记 0否 1是
    "BitBoxMark": "0", //零箱标记  0否 代表整箱  1是 代表零箱
    "InspectStatus": "0", //质检状态 0待检验 1合格  2不合格 3放置期
    "Standard": "", //物料规格
    "PackageStandard": "", //包装规格
    "StoreTime": "2025-08-19T02:16:45.301Z", //储存期至
    "QtyOrd": 5, //第几件
    "QtyCount": 5 //总件数
    "OrderCode": "", //��ϸ�������ݺ�
    "BoxNo": "BCP24101601000002", //���
    "BoxNo2": "HCP24101601000006", //�к�
    "BoxNo3": "ZCP24101601000011", //֧��
    "Qty": 1, //����
    "FullQty": 10, //��������
    "SkuNo": "CP00201", //���ϱ���
    "SkuName": "达格列净二甲双胍缓释片", //��������
    "LotNo": "CP24101601", //����
    "LotText": "", //��������
    "SupplierLot":"",
    "ProductionTime": "2024-10-16T02:16:45.301Z", //��������
    "ExpirationTime": "2025-10-16T02:16:45.301Z", //��������
    "InspectMark": "0", //����/��� ��� 0�� 1��
    "BitBoxMark": "1", //������  0�� ��������  1�� ��������
    "InspectStatus": "0", //�ʼ�״̬ 0������ 1�ϸ�  2���ϸ� 3������
    "Standard": "", //���Ϲ��
    "PackageStandard": "", //��װ���
    "StoreTime": "2025-10-16T02:16:45.301Z", //��������
    "QtyOrd": 0, //�ڼ���
    "QtyCount": 0 //�ܼ���
  },
  {
    "OrderCode": "", //明细生产单据号
    "BoxNo": "B2408190001000001", //箱号
    "BoxNo2": "", //盒号
    "BoxNo3": "Z24081900010002", //支号
    "Qty": 1, //数量
    "FullQty": 2, //满箱数量
    "SkuNo": "00001", //物料编码
    "SkuName": "测试物料1", //物料名称
    "LotNo": "CPPC240818001", //批次
    "LotText": "", //批次描述
    "SupplierLot":"GH240818001",
    "ProductionTime": "2024-08-19T02:16:45.301Z", //生产日期
    "ExpirationTime": "2025-08-19T02:16:45.301Z", //过期日期
    "InspectMark": "0", //检验/抽检 标记 0否 1是
    "BitBoxMark": "0", //零箱标记  0否 代表整箱  1是 代表零箱
    "InspectStatus": "0", //质检状态 0待检验 1合格  2不合格 3放置期
    "Standard": "", //物料规格
    "PackageStandard": "", //包装规格
    "StoreTime": "2025-08-19T02:16:45.301Z", //储存期至
    "QtyOrd": 5, //第几件
    "QtyCount": 5 //总件数
    "OrderCode": "", //��ϸ�������ݺ�
    "BoxNo": "BCP24101601000002", //���
    "BoxNo2": "HCP24101601000006", //�к�
    "BoxNo3": "ZCP24101601000012", //֧��
    "Qty": 1, //����
    "FullQty": 10, //��������
    "SkuNo": "CP00201", //���ϱ���
    "SkuName": "达格列净二甲双胍缓释片", //��������
    "LotNo": "CP24101601", //����
    "LotText": "", //��������
    "SupplierLot":"",
    "ProductionTime": "2024-10-16T02:16:45.301Z", //��������
    "ExpirationTime": "2025-10-16T02:16:45.301Z", //��������
    "InspectMark": "0", //����/��� ��� 0�� 1��
    "BitBoxMark": "1", //������  0�� ��������  1�� ��������
    "InspectStatus": "0", //�ʼ�״̬ 0������ 1�ϸ�  2���ϸ� 3������
    "Standard": "", //���Ϲ��
    "PackageStandard": "", //��װ���
    "StoreTime": "2025-10-16T02:16:45.301Z", //��������
    "QtyOrd": 0, //�ڼ���
    "QtyCount": 0 //�ܼ���
  }
]

			@@ -2552,8 +2552,13 @@
			detailModel.SupplierName = notice.CustomerName;//供应商名称
			}
			#region 维护质检结果

			//获取该批次最终质检结果
			var quality = Db.Queryable<BllQualityInspect>().Where(a => a.LotNo == noticeDetail.LotNo && a.IsDel == "0").OrderByDescending(a => a.CreateTime).First();
			if (notice.Type == "3")
			{
			quality = Db.Queryable<BllQualityInspect>().Where(a => a.LotNo == noticeDetail.LotNo && a.ASNNo == notice.ASNNo && a.IsDel == "0").OrderByDescending(a => a.CreateTime).First();
			}
			if (quality != null)
			{
			//修改合格不合格数量

			@@ -539,7 +539,7 @@
			{
			var biaoShi = "0";//0：整箱拣货、1：散支拣货、2：数量拣货
			List<DataBoxInfo> boxInfos;
			var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);
			var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo && m.StockDetailId == stockDetail.Id);
			if (boxInfo.Count() == 0)
			{
			throw new Exception("未查询到该箱码及追溯码的信息");
			@@ -653,6 +653,7 @@

			if (biaoShi != "2")
			{
			pickQty += item.Qty;
			//删除库存箱码明细
			Db.Deleteable(item).ExecuteCommand();
			}
			@@ -660,17 +661,20 @@
			{
			if (decimal.Parse(pickQty1) == item.Qty)
			{
			pickQty += item.Qty;
			//删除库存箱码明细
			Db.Deleteable(item).ExecuteCommand();

			}
			else
			{
			pickQty += decimal.Parse(pickQty1);
			item.Qty -= decimal.Parse(pickQty1);
			item.BitBoxMark = "1";//零箱标识
			Db.Updateable(item).ExecuteCommand();
			}
			}
			pickQty += item.Qty;

			}
			//改变库内箱码是否零箱信息
			if (biaoShi == "1")
			@@ -3230,6 +3234,7 @@

			if (biaoShi != "2")
			{
			pickQty += item.Qty;
			//删除库存箱码明细
			Db.Deleteable(item).ExecuteCommand();
			}
			@@ -3237,17 +3242,19 @@
			{
			if (decimal.Parse(pickQty1) == item.Qty)
			{
			pickQty += item.Qty;
			//删除库存箱码明细
			Db.Deleteable(item).ExecuteCommand();
			}
			else
			{
			pickQty += decimal.Parse(pickQty1);
			item.Qty -= decimal.Parse(pickQty1);
			item.BitBoxMark = "1";//零箱标识
			Db.Updateable(item).ExecuteCommand();
			}
			}
			pickQty += item.Qty;

			}
			//改变库内箱码是否零箱信息
			if (biaoShi == "1")
			@@ -4265,7 +4272,7 @@
			PalletNo3 = item.PalletNo3,
			Qty = decimal.Parse(pickQty1),
			FullQty = item.FullQty,
			Status = "4",
			Status = "5",
			LotNo = item.LotNo,
			LotText = item.LotText,
			SkuNo = item.SkuNo,

			@@ -3239,10 +3239,41 @@
			throw new Exception("获取失败，出库单状态不允许!");
			}
			}

			string inspectStatus = string.Empty;
			switch (notice.Type)//0：原料 1：包材 2：成品 3：耗材 4：半成品
			{
			case "0"://成品出库
			inspectStatus = "1";
			break;
			case "1"://领料出库
			inspectStatus = "1";
			break;
			case "2"://抽检出库
			inspectStatus = "0,1,2";
			break;
			case "3"://物料取样出库
			inspectStatus = "0";
			break;
			case "4"://不合格品出库
			inspectStatus = "2";
			break;
			case "5"://中间品出库
			inspectStatus = "1";
			break;
			case "6"://代储出库
			inspectStatus = "0,1,2";
			break;
			case "8"://寄存出库
			inspectStatus = "0,1";
			break;
			default: //其它出库
			inspectStatus = "0,1";
			break;
			}
			#endregion

			Expression<Func<DataStockDetail, bool>> item = Expressionable.Create<DataStockDetail>()
			.AndIF(!string.IsNullOrWhiteSpace(inspectStatus), m => inspectStatus.Contains(m.InspectStatus))
			.AndIF(!string.IsNullOrWhiteSpace(houseNo), m => m.WareHouseNo == houseNo)
			.AndIF(!string.IsNullOrWhiteSpace(roadwayNo), m => m.RoadwayNo == roadwayNo)
			.AndIF(!string.IsNullOrWhiteSpace(locateNo), m => m.LocatNo == locateNo)

			@@ -1,48 +1,48 @@
			[
			{
			"OrderCode": "", //明细生产单据号
			"BoxNo": "B2408190001000001", //箱号
			"BoxNo2": "", //盒号
			"BoxNo3": "Z24081900010001", //支号
			"Qty": 1, //数量
			"FullQty": 2, //满箱数量
			"SkuNo": "00001", //物料编码
			"SkuName": "测试物料1", //物料名称
			"LotNo": "CPPC240818001", //批次
			"LotText": "", //批次描述
			"SupplierLot":"GH240818001",
			"ProductionTime": "2024-08-19T02:16:45.301Z", //生产日期
			"ExpirationTime": "2025-08-19T02:16:45.301Z", //过期日期
			"InspectMark": "0", //检验/抽检标记 0否 1是
			"BitBoxMark": "0", //零箱标记 0否代表整箱 1是代表零箱
			"InspectStatus": "0", //质检状态 0待检验 1合格 2不合格 3放置期
			"Standard": "", //物料规格
			"PackageStandard": "", //包装规格
			"StoreTime": "2025-08-19T02:16:45.301Z", //储存期至
			"QtyOrd": 5, //第几件
			"QtyCount": 5 //总件数
			"OrderCode": "", //��ϸ��ݺ�
			"BoxNo": "BCP24101601000002", //��
			"BoxNo2": "HCP24101601000006", //�к�
			"BoxNo3": "ZCP24101601000011", //֧��
			"Qty": 1, //��
			"FullQty": 10, //��
			"SkuNo": "CP00201", //��ϱ��
			"SkuName": "达格列净二甲双胍缓释片", //��
			"LotNo": "CP24101601", //��
			"LotText": "", //��
			"SupplierLot":"",
			"ProductionTime": "2024-10-16T02:16:45.301Z", //��
			"ExpirationTime": "2025-10-16T02:16:45.301Z", //��
			"InspectMark": "0", //��/�� 0�� 1��
			"BitBoxMark": "1", //�� 0�� 1��
			"InspectStatus": "0", //�ʼ�״̬ 0�� 1�ϸ� 2��ϸ� 3��
			"Standard": "", //��Ϲ��
			"PackageStandard": "", //��װ��
			"StoreTime": "2025-10-16T02:16:45.301Z", //��
			"QtyOrd": 0, //�ڼ��
			"QtyCount": 0 //�ܼ��
			},
			{
			"OrderCode": "", //明细生产单据号
			"BoxNo": "B2408190001000001", //箱号
			"BoxNo2": "", //盒号
			"BoxNo3": "Z24081900010002", //支号
			"Qty": 1, //数量
			"FullQty": 2, //满箱数量
			"SkuNo": "00001", //物料编码
			"SkuName": "测试物料1", //物料名称
			"LotNo": "CPPC240818001", //批次
			"LotText": "", //批次描述
			"SupplierLot":"GH240818001",
			"ProductionTime": "2024-08-19T02:16:45.301Z", //生产日期
			"ExpirationTime": "2025-08-19T02:16:45.301Z", //过期日期
			"InspectMark": "0", //检验/抽检标记 0否 1是
			"BitBoxMark": "0", //零箱标记 0否代表整箱 1是代表零箱
			"InspectStatus": "0", //质检状态 0待检验 1合格 2不合格 3放置期
			"Standard": "", //物料规格
			"PackageStandard": "", //包装规格
			"StoreTime": "2025-08-19T02:16:45.301Z", //储存期至
			"QtyOrd": 5, //第几件
			"QtyCount": 5 //总件数
			"OrderCode": "", //��ϸ��ݺ�
			"BoxNo": "BCP24101601000002", //��
			"BoxNo2": "HCP24101601000006", //�к�
			"BoxNo3": "ZCP24101601000012", //֧��
			"Qty": 1, //��
			"FullQty": 10, //��
			"SkuNo": "CP00201", //��ϱ��
			"SkuName": "达格列净二甲双胍缓释片", //��
			"LotNo": "CP24101601", //��
			"LotText": "", //��
			"SupplierLot":"",
			"ProductionTime": "2024-10-16T02:16:45.301Z", //��
			"ExpirationTime": "2025-10-16T02:16:45.301Z", //��
			"InspectMark": "0", //��/�� 0�� 1��
			"BitBoxMark": "1", //�� 0�� 1��
			"InspectStatus": "0", //�ʼ�״̬ 0�� 1�ϸ� 2��ϸ� 3��
			"Standard": "", //��Ϲ��
			"PackageStandard": "", //��װ��
			"StoreTime": "2025-10-16T02:16:45.301Z", //��
			"QtyOrd": 0, //�ڼ��
			"QtyCount": 0 //�ܼ��
			}
			]