Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxia...

pan

6 天以前 77c5c0b820513fee5d83ea1957012d3bfdac926f

Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/stock/stockInfoDetailByMaterielSum.vue

@@ -81,13 +81,6 @@
        align: "left",
      },
      {
        field: "stockId",
        title: "库存信息主键",
        type: "string",
        width: 90,
        align: "left",
      },
      {
        field: "materielCode",
        title: "物料编号",
        type: "string",
@@ -102,24 +95,10 @@
        align: "left",
      },
      {
        field: "orderNo",
        title: "单据编号",
        type: "decimal",
        width: 90,
        align: "left",
      },
      {
        field: "batchNo",
        title: "批次号",
        type: "string",
        width: 90,
        align: "left",
      },
      {
        field: "serialNumber",
        title: "序列号",
        type: "int",
        width: 120,
        align: "left",
      },
      {
@@ -135,14 +114,7 @@
        type: "string",
        width: 120,
        align: "left",
      },
      {
        field: "barcode",
        title: "条码",
        type: "string",
        width: 120,
        align: "left",
      },
      },        
      {
        field: "stockQuantity",
        title: "库存数量",

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs

@@ -3033,7 +3033,7 @@
                if (materielGroupDTO.orderTypes == InOrderTypeEnum.ReCheck.ObjToInt())
                {
                    var dborder = _reCheckOrderService.Db.Queryable<Dt_ReCheckOrder>().First(x => x.OrderNo == materielGroupDTO.OrderNo);
                    if (dborder != null && dborder.SignSeq == 0)
                    if (dborder != null && (dborder.SignSeq == 0 || dborder.SignSeq == 1))
                    {
                        return content.Error("只有拿到重检结果才能入库！");
                    }