更新优化

wangxinhui

2025-01-13 ecc6584530bd9995abeeb93928247cdf706aed33

更新优化

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue

@@ -236,7 +236,7 @@
          align: "left",
        },
        {
          field: "orderId",
          field: "receiveOrderId",
          title: "收货单主键",
          type: "string",
          width: 90,
@@ -244,8 +244,8 @@
          hidden: true,
        },
        {
          field: "rowNo",
          title: "行号",
          field: "purchaseOrderDetailRowNo",
          title: "采购单明细行号",
          type: "string",
          width: 60,
          align: "left",
@@ -256,7 +256,6 @@
          type: "select",
          width: 160,
          align: "left",
          edit: { type: "" },
          required: true,
        },
        {
@@ -265,7 +264,6 @@
          type: "select",
          width: 150,
          align: "left",
          edit: { type: "" },
          required: true,
        },
        {
@@ -274,7 +272,6 @@
          type: "string",
          width: 150,
          align: "left",
          edit: { type: "" },
        },
        {
          field: "lotNo",
@@ -282,16 +279,14 @@
          type: "decimal",
          width: 90,
          align: "left",
          edit: { type: "" },
          required: true,
        },
        {
          field: "receivedQty",
          field: "receivedQuantity",
          title: "收货数量",
          type: "decimal",
          width: 90,
          align: "left",
          edit: { type: "number" },
          required: true,
        },
        {
@@ -300,6 +295,7 @@
          type: "int",
          width: 90,
          align: "left",
          bind: { key: "yesno", data: [] },
        },
        {
          field: "priceInTax",
@@ -316,8 +312,8 @@
          align: "left",
        },
        {
          field: "currCode",
          title: "币别编码",
          field: "unit",
          title: "单位",
          type: "string",
          width: 90,
          align: "left",

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue

@@ -177,6 +177,21 @@
        bind: { key: "createType", data: [] },
      },
      {
        field: "departmentCode",
        title: "修改时间",
        type: "string",
        width: 120,
        align: "left",
        hidden:true
      },
      {
        field: "departmentName",
        title: "部门名称",
        type: "string",
        width: 160,
        align: "left",
      },
      {
        field: "creater",
        title: "创建人",
        type: "string",

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs

@@ -870,6 +870,15 @@
                    return PalletTypeEnum.LargestPallet.ObjToInt();
                }
            }
            else if (warehouse.WarehouseCode == WarehouseEnum.HA153.ObjToString())
            {
                Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 1));
                if (palletTypeInfo == null)
                {
                    throw new Exception($"托盘号错误");
                }
                return palletTypeInfo.PalletType;
            }
            else if (warehouse.WarehouseCode == WarehouseEnum.HA152.ObjToString())
            {
                Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 2));

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderDetailService.cs

@@ -89,7 +89,7 @@
                {
                    return WebResponseContent.Instance.Error($"该采购单收货已完成");
                }
                Dt_PurchaseOrderDetail? purchaseOrderDetail = purchaseOrder.Details.FirstOrDefault(x => x.MaterielCode == model.MaterielCode && (x.PurchaseDetailStatus == PurchaseOrderDetailStatusEnum.NotReceived.ObjToInt() || x.PurchaseDetailStatus == PurchaseOrderDetailStatusEnum.Receiving.ObjToInt()));
                Dt_PurchaseOrderDetail? purchaseOrderDetail = purchaseOrder.Details.Where(x => x.MaterielCode == model.MaterielCode && (x.PurchaseDetailStatus == PurchaseOrderDetailStatusEnum.NotReceived.ObjToInt() || x.PurchaseDetailStatus == PurchaseOrderDetailStatusEnum.Receiving.ObjToInt())).FirstOrDefault();
                if (purchaseOrderDetail == null)
                {
                    return WebResponseContent.Instance.Error($"该采购单明细收货已完成");

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs

@@ -312,7 +312,9 @@
                            WarehouseId = warehouse.WarehouseId,
                            DepartmentCode = model.DepartmentCode,
                            DepartmentName = model.DepartmentName,
                            Details = new List<Dt_OutboundOrderDetail> { outboundOrderDetail }
                            Details = new List<Dt_OutboundOrderDetail> { outboundOrderDetail },
                            Remark= model.Node

                        };
                        Db.InsertNav(outboundOrder).Include(x => x.Details).ExecuteCommand();
                    }

 ´úÂë¹ÜÀí/»´°²PDA/pages/stash/QueryData.vue

@@ -13,6 +13,7 @@
                    <view class="uni-list-box">
                        <view class="uni-content">
                            <view class="uni-title-sub uni-ellipsis-2">托盘号：{{stockInfoBarcode}}</view>
                            <view class="uni-title-sub uni-ellipsis-2">总数量：{{Summmary}}</view>
                        </view>
                    </view>
                </template>
@@ -45,6 +46,7 @@
                // stockInfo: [],
                stockInfoDetail: [],
                barcode: '',
                Summmary: 0,
                barcodefocus: false,
                warehouseId: 0,
                stockInfoBarcode: '',
@@ -71,6 +73,10 @@
                                this.stockInfoBarcode = res.data.palletCode,
                                    // this.stockInfo = res.data,
                                    this.stockInfoDetail = res.data.details
                                    //获取总数量
                                    this.stockInfoDetail.forEach(item => {
                                        this.Summmary+= item.stockQuantity;
                                    });
                            } else {
                                this.$refs.uToast.show({
                                    // title: "未找到托盘信息",

 ´úÂë¹ÜÀí/»´°²PDA/pages/stash/boxing.vue

@@ -72,6 +72,33 @@
                        </uni-forms-item>
                    </uni-forms>
                </view>
                <view>
                    <uni-list>
                        <uni-list-item direction="column" v-if="inboundBarcode">
                            <template v-slot:body>
                                <view class="uni-list-box">
                                    <view class="uni-content">
                                        <view class="uni-title-sub uni-ellipsis-2">组盘总数量：{{Summmary}}</view>
                                    </view>
                                </view>
                            </template>
                        </uni-list-item>
                        <uni-list-item direction="column" v-for="(item,index) in stockInfoDetail" :key="index">
                            <template v-slot:body>
                                <view class="uni-list-box">
                                    <view class="uni-content">
                                        <view class="uni-title-sub uni-ellipsis-2">物料编号：{{item.materielCode}}</view>
                                        <view class="uni-note">物料名称：{{item.materielName}}</view>
                                        <view class="uni-note">物料批次：{{item.batchNo}}</view>
                                        <view class="uni-note">组盘数量：{{item.stockQuantity}}</view>
                                        <view class="uni-note">生产日期：{{item.productionDate}}</view>
                                        <view class="uni-note">有 æ•ˆ æœŸï¼š{{item.effectiveDate}}</view>
                                    </view>
                                </view>
                            </template>
                        </uni-list-item>
                    </uni-list>
                </view>
            </view>
            <view v-if="current === 2" class="headerstyle">
                <view class="itemstyle">
@@ -181,6 +208,8 @@
                Testlabel: "",
                Testplaceholder: "",
                Testcheck: false,
                Summmary:0,
                stockInfoDetail:[]
            }
        },
        onShow() {},
@@ -450,6 +479,34 @@
                        this.addressFocus = true;
                    }
                })
                this.$nextTick(function(x) {
                    if (this.inboundBarcode != '') {
                        var postData = {
                            MainData: {
                                "barcode": this.inboundBarcode,
                                "warehouseId": this.warehouseId,
                            }
                        };
                        this.$u.post('/api/StockInfo/StockQueryData', postData).then(res => {
                            // this.stockInfo = [];
                            this.stockInfoDetail = [];
                            if (res.status) {
                                    // this.stockInfo = res.data,
                                    this.stockInfoDetail = res.data.details
                                    //获取总数量
                                    this.stockInfoDetail.forEach(item => {
                                        this.Summmary+= item.stockQuantity;
                                    });
                            } else {
                                this.$refs.uToast.show({
                                    // title: "未找到托盘信息",
                                    title: res.message,
                                    type: "error"
                                })
                            }
                        })
                    }
                })
            },
            deleteList(res) {
                this.matInfos.splice(res, 1);

 ´úÂë¹ÜÀí/»´°²PDA/pages/stash/pickingMat.vue

@@ -69,6 +69,34 @@
                        </uni-forms-item>
                    </uni-forms>
                </view>
                <view>
                    <uni-list>
                        <uni-list-item direction="column" v-if="inboundBarcode">
                            <template v-slot:body>
                                <view class="uni-list-box">
                                    <view class="uni-content">
                                        <view class="uni-title-sub uni-ellipsis-2">总数量：{{Summmary}}</view>
                                    </view>
                                </view>
                            </template>
                        </uni-list-item>
                        <uni-list-item direction="column" v-for="(item,index) in stockInfoDetail" :key="index">
                            <template v-slot:body>
                                <view class="uni-list-box">
                                    <view class="uni-content">
                                        <view class="uni-title-sub uni-ellipsis-2">物料编号：{{item.materielCode}}</view>
                                        <view class="uni-note">物料名称：{{item.materielName}}</view>
                                        <view class="uni-note">物料批次：{{item.batchNo}}</view>
                                        <view class="uni-note">库存数量：{{item.stockQuantity}}</view>
                                        <view class="uni-note">出库数量：{{item.outboundQuantity}}</view>
                                        <view class="uni-note">生产日期：{{item.productionDate}}</view>
                                        <view class="uni-note">有 æ•ˆ æœŸï¼š{{item.effectiveDate}}</view>
                                    </view>
                                </view>
                            </template>
                        </uni-list-item>
                    </uni-list>
                </view>
            </view>
        </view>
        <u-toast ref="uToast" />
@@ -106,6 +134,8 @@
                inboundBarcode: "",
                address: "",
                warehouseId: 0,
                Summmary: 0,
                stockInfoDetail: []
            }
        },
        onLoad(res) {
@@ -176,6 +206,34 @@
                        this.addressFocus = true;
                    }
                })
                this.$nextTick(function(x) {
                    if (this.inboundBarcode != '') {
                        var postData = {
                            MainData: {
                                "barcode": this.inboundBarcode,
                                "warehouseId": this.warehouseId,
                            }
                        };
                        this.$u.post('/api/StockInfo/StockQueryData', postData).then(res => {
                            // this.stockInfo = [];
                            this.stockInfoDetail = [];
                            if (res.status) {
                                    // this.stockInfo = res.data,
                                    this.stockInfoDetail = res.data.details
                                    //获取总数量
                                    this.stockInfoDetail.forEach(item => {
                                        this.Summmary+= item.stockQuantity;
                                    });
                            } else {
                                this.$refs.uToast.show({
                                    // title: "未找到托盘信息",
                                    title: res.message,
                                    type: "error"
                                })
                            }
                        })
                    }
                })
            },
            picking() {
                if (this.barcode == "") {

 ´úÂë¹ÜÀí/»´°²PDA/pages/stash/receiveorderoutbound.vue

@@ -50,7 +50,6 @@
                <uni-list :border="true">
                    <uni-list-item direction="column" v-for="(item,index) in orderInfo" :key="item.dtlId">
                        <template v-slot:body>
                            <view class="uni-list-box">
                                <view class="uni-content">
                                    <view style="font-size: 18px;">收货单号：{{orderNo}}</view>
                                    <view style="font-size: 18px;">采购单号：{{item.purchaseOrderNo}}</view>
@@ -59,7 +58,6 @@
                                    <view style="font-size: 18px;">收货数量：{{item.receivedQuantity}}</view>
                                    <view style="font-size: 18px;">是否质检：{{item.ifInspection==1?"是":"否"}}</view>
                                </view>
                            </view>
                        </template>
                    </uni-list-item>
                </uni-list>