wangxinhui
7 天以前 f7d286cec2a2c6f8eb00a24f2238c86978358d8e
更新
已修改3个文件
11 ■■■■ 文件已修改
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/mesProInOrder.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/mesProInOrderDetail.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/ProStockInfoRepository.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/inbound/mesProInOrder.vue
@@ -250,7 +250,7 @@
          type: "string",
          width: 80,
          align: "left",
          bind: { key: "enableEnum", data: [] },
          bind: { key: "", data: [{key:0,value:'否'},{key:1,value:'是'}] },
        },
    {
        field: "overInQuantity",
´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/inbound/mesProInOrderDetail.vue
@@ -40,8 +40,8 @@
        { title: "内包号", field: "bagNo",type:"like" },
        { title: "产品编码", field: "productCode", type: "like" },
        { title: "是否精品", field: "isFineWorks" ,type: "select",
          dataKey: "enableEnum",
          data: [],},
          dataKey: "",
          data: [{key:0,value:'否'},{key:1,value:'是'}],},
        { title: "版本", field: "productVersion",type:"like" },
      ],
      [
@@ -73,7 +73,7 @@
          type: "string",
          width: 80,
          align: "left",
          bind: { key: "enableEnum", data: [] },
          bind: { key: "", data: [{key:0,value:'否'},{key:1,value:'是'}] },
        },
    {
        field: "overInQuantity",
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/ProStockInfoRepository.cs
@@ -27,6 +27,7 @@
            List<Dt_ProStockInfo>? proStockInfos = null;
            bool isCanLot= string.IsNullOrEmpty(proOutOrderDetail.PLot);
            bool isCanVer = string.IsNullOrEmpty(proOutOrderDetail.OutSpecifyVer);
            isFineWorks = !isFineWorks;
            ////判断客户出入规则
            //Dt_CustomerInfo customerInfo = _basicRepository.CustomerInfoRepository.QueryFirst(x=>x.Code== proOutOrderDetail.Customer);
            //if (customerInfo==null)
@@ -56,7 +57,7 @@
                    v.ProductCode == proOutOrderDetail.PCode
                    && v.ProductVersion.StartsWith(proOutOrderDetail.PVer.Substring(0,1)) 
                    && (isCanLot ? isCanLot : v.ProductCode == proOutOrderDetail.PLot)
                    && (isFineWorks ? !isCanLot : v.IsFineWorks == 1)
                    && (isFineWorks ? isFineWorks : v.IsFineWorks == 1)
                ))
                .ToList();
            //}