Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZh...

dengjunjie

2025-10-23 2728af674688a3d4d18ef498fde3ea808549f51b

Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_InventoryInfo.cs

@@ -100,6 +100,22 @@
        [SugarColumn(IsNullable = false, ColumnDescription = "出库数", DefaultValue = "0")]
        public decimal OutboundQuantity { get; set; }


        /// <summary>
        /// å¯ç”¨åº“存数量  =实际库存数-待出库数量
        /// </summary>
        [SugarColumn(IsNullable = false, ColumnDescription = "可用库存数量", DefaultValue = "0")]
        public decimal AvailableQuantity { get; set; }



        /// <summary>
        /// æŠ¥è­¦ä¿¡æ¯
        /// </summary>
         [SugarColumn(IsNullable = true,Length =255, ColumnDescription = "报警信息")]
        public string AlarmInformation { get; set; }


        /// <summary>
        /// ç›˜ç‚¹æ•°ï¼›ç›˜ç‚¹åŽå®žé™…数量
        /// </summary>

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_Inventory_Batch.cs

@@ -68,6 +68,14 @@
        [SugarColumn(IsNullable = false, ColumnDescription = "待出库数", DefaultValue = "0")]
        public decimal OutboundQuantity { get; set; }


        /// <summary>
        /// å¯ç”¨åº“存数量  =实际库存数-待出库数量
        /// </summary>
        [SugarColumn(IsNullable = false, ColumnDescription = "可用库存数量", DefaultValue = "0")]
        public decimal AvailableQuantity { get; set; }


        /// <summary>
        /// ç›˜ç‚¹æ•°ï¼›ç›˜ç‚¹åŽå®žé™…数量（同物料同批次总和）
        /// </summary>

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs

@@ -91,7 +91,7 @@
        public ApiResponse<Dt_InventoryInfo> OrderFeedback(EdiOrderCallbackRequest request)
        {
            try
            {
            {  
                // 1️⃣ æ ¡éªŒè¯·æ±‚
                if (request == null || request.details == null || !request.details.Any())
                {
@@ -130,6 +130,7 @@
                            StockQuantity = 0,
                            OutboundQuantity = 0,
                            SupplyQuantity = 0,
                            AvailableQuantity = 0,
                            InDate = DateTime.Now,
                            ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
                            ShelfLife = 0,
@@ -152,6 +153,7 @@
                            BatchNo = detail.batchNo,
                            StockQuantity = 0,
                            OutboundQuantity = 0,
                            AvailableQuantity = 0,
                            SupplyQuantity = 0,
                            ERPStockQuantity = 0,
                            Status = false,
@@ -166,11 +168,13 @@
                    {
                        case "1": //入库
                            entity.StockQuantity = orderQty; //实际库存
                            entity.AvailableQuantity = orderQty;
                            entity.InDate = DateTime.Now;
                            entity.Remark = "入库单回传";


                            batch.StockQuantity = orderQty;
                            batch.AvailableQuantity = orderQty;
                            batch.Remark = "入库单回传";
                            UpdateInboundOrderDetailStatus(detail.batchNo, detail.productCode);
                            break;
@@ -179,12 +183,14 @@
                            decimal actualOutQty = entity.StockQuantity - orderQty;// è®¡ç®—本次实际出库数量 20
                            entity.StockQuantity=orderQty; //实际库存数 100
                            entity.OutboundQuantity =Math.Max(0,entity.OutboundQuantity-actualOutQty); //待出库数量
                            entity.AvailableQuantity = entity.StockQuantity - entity.OutboundQuantity;//可用库存
                            if (entity.StockQuantity < 0) entity.StockQuantity = 0;
                            entity.Remark = "出库单回传";


                            batch.StockQuantity = orderQty;
                            batch.OutboundQuantity =Math.Max(0,batch.OutboundQuantity-actualOutQty);//待出库数量
                            batch.AvailableQuantity = batch.StockQuantity - batch.OutboundQuantity; //可用库存
                            if (batch.StockQuantity < 0) batch.StockQuantity = 0;
                            batch.Remark = "出库单回传";
                            UpdateOutboundOrderDetailStatus(detail.batchNo, detail.productCode);

 н¨Îļþ¼Ð/WMS/src/views/basic/materielInfo.vue

@@ -190,14 +190,14 @@
        }
      ],
      [
        // {
        //   title: "下发状态",
        //   field: "goodStatusState",
        //   type: "select",
        //   dataKey: "goodStatusState",
        //   data: [],
        //   required: true,
        // }
        {
          title: "下发状态",
          field: "goodStatusState",
          type: "select",
          dataKey: "goodStatusState",
          data: [],
          required: true,
        }
      ],
      [
        {

 н¨Îļþ¼Ð/WMS/src/views/inbound/inboundOrder.vue

@@ -274,8 +274,8 @@
          type: "string",
          width: 120,
          align: "left",
          // bind: { key: "reservoirArea", data: [] }
          // edit:{type:'select',dataKey:'reservoirArea',data:[]}
          bind: { key: "warehouseNuber", data: [] },
          edit:{type:'select',dataKey:'warehouseNuber',data:[]},
          edit:{type:""}
        },
        {

 н¨Îļþ¼Ð/WMS/src/views/inbound/inboundOrderDetail.vue

@@ -52,7 +52,7 @@
          title: "库区",
          field: "reservoirarea",
          type: "select",
          dataKey: "reservoirArea",
          dataKey: "warehouseNuber",
          data: [],
        },
        {
@@ -169,7 +169,7 @@
        type: "string",
        width: 120,
        align: "left",
        bind: { key: "reservoirArea", data: [] },
        bind: { key: "warehouseNuber", data: [] },
      },
      {
        field: "goodsNo",

 н¨Îļþ¼Ð/WMS/src/views/inbound/inboundOrderDetail_Hty.vue

@@ -91,7 +91,7 @@
                    type: 'string',
                    width: 120,
                    align: 'left',
                    bind: { key: "reservoirArea", data: [] }
                    bind: { key: "warehouseNuber", data: [] }
                },
                {
                    field: 'goodsNo',
@@ -203,7 +203,7 @@
            type: 'string',
            width: 120,
            align: 'left',
            bind: { key: "reservoirArea", data: [] }
            bind: { key: "warehouseNuber", data: [] }
        },
        {
            field: 'goodsNo',

 н¨Îļþ¼Ð/WMS/src/views/inbound/inboundOrder_Hty.vue

@@ -194,7 +194,7 @@
                        type: 'string',
                        width: 120,
                        align: 'left',
                        bind: { key: "reservoirArea", data: [] }
                        bind: { key: "warehouseNuber", data: [] }
                    },
                    {
                        field: 'goods_no',

 н¨Îļþ¼Ð/WMS/src/views/outbound/outboundOrder.vue

@@ -268,7 +268,7 @@
                        type: 'string',
                        width: 120,
                        align: 'left',
                        // bind: { key: "reservoirArea", data: [] }
                        bind: { key: "warehouseNuber", data: [] },
                        edit:{type:""}

                    },

 н¨Îļþ¼Ð/WMS/src/views/outbound/outboundOrder_Hty.vue

@@ -117,11 +117,11 @@
                },
                {
                    field: 'warehouse_no',
                    title: '库房号',
                    title: '库区',
                    type: 'string',
                    width: 100,
                    align: 'left',
                    bind: { key: "warehouse", data: [] }
                    bind: { key: "warehouseNuber", data: [] }
                },
                {
                    field: 'account_time',

 н¨Îļþ¼Ð/WMS/src/views/stock/Dt_Inventory_Batch.vue

@@ -66,7 +66,7 @@
          type: "number",
        },
        {
          title: "待出库数",
          title: "待出库数量",
          required: true,
          field: "outboundQuantity",
          type: "number",
@@ -175,7 +175,7 @@
      },
      {
        field: "outboundQuantity",
        title: "待出库数",
        title: "待出库数数量",
        type: "number",
        width: 100,
        align: "left",