dengjunjie
2025-10-27 6966c63c04c57ddec44e2e0c00c544a09737097b
优化PDA入库功能
已修改4个文件
已添加1个文件
77 ■■■■ 文件已修改
新建文件夹/PDA/pages/stash/inboundorder.vue 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
新建文件夹/PDA/pages/stash/inboundorderDetail.vue 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
新建文件夹/PDA/pages/stash/raworderboxing.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
新建文件夹/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目资料/医药项目系统WMS (上游)问题点.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
н¨Îļþ¼Ð/PDA/pages/stash/inboundorder.vue
@@ -6,28 +6,33 @@
            </view>
        </u-sticky>
        <uni-list :border="true">
            <uni-list-item direction="column" clickable @click="groupClick(item.order_no)" link
                :to="page+item.order_no" v-for="item in allReceivingOrders" :key="item.order_no">
            <uni-list-item direction="column" clickable @click="groupClick(item.order_no)" link :to="page+item.order_no"
                v-for="item in allReceivingOrders" :key="item.order_no">
                <template v-slot:body>
                    <uni-group margin-top="20">
                        <view style="line-height: 17px;color: #596671;font-size: 14px;text-align: center;display: flex;justify-content: space-between;">
                        <view
                            style="line-height: 17px;color: #596671;font-size: 14px;text-align: center;display: flex;justify-content: space-between;">
                            å…¥åº“单号&nbsp;&nbsp;{{item.order_no}} 
                        </view>
                        <view style="margin-top: 10rpx;line-height: 17px;color: #596671;font-size: 14px;text-align: center;display: flex;justify-content: space-between;">
                        <view
                            style="margin-top: 10rpx;line-height: 17px;color: #596671;font-size: 14px;text-align: center;display: flex;justify-content: space-between;">
                            ä¾›åº”商名称&nbsp;&nbsp;{{item.supplier_name}} 
                        </view>
                        <view style="margin-top: 10rpx;line-height: 17px;color: #596671;font-size: 14px;text-align: center;display: flex;justify-content: space-between;">
                        <view
                            style="margin-top: 10rpx;line-height: 17px;color: #596671;font-size: 14px;text-align: center;display: flex;justify-content: space-between;">
                            åˆ›å»ºæ—¥æœŸ&nbsp;&nbsp;{{item.createDate}} 
                        </view>
                        <view style="margin-top: 10rpx;display: flex;align-items: center; ">
                        <view
                            style="margin-top: 10rpx;display: flex;align-items: center; ">
                            <view style="text-align: center;line-height: 40rpx;border-radius: 8rpx; width: 238rpx;height: 40rpx;font-size: 22rpx;background-color:rgba(22,127,247,0.18);color: #1F63FF;">
                                style="text-align: center;line-height: 40rpx;border-radius: 8rpx; width: 238rpx;height: 40rpx;font-size: 22rpx;background-color:rgba(22,127,247,0.18);color: #1F63FF;">
                                è®¢å•状态&nbsp;&nbsp;{{item.odrderStatus}}
                            </view>
                            <view style="text-align: center;line-height: 40rpx;border-radius: 8rpx; width: 158rpx;height: 40rpx;font-size: 22rpx;color: #F56C6C;">
                            <view
                                style="text-align: center;line-height: 40rpx;border-radius: 8rpx; width: 158rpx;height: 40rpx;font-size: 22rpx;color: #F56C6C;">
                                æ€»é‡&nbsp;&nbsp;{{item.SumQty}}
                            </view>
                            <view style="text-align: center;line-height: 40rpx;border-radius: 8rpx; width: 158rpx;height: 40rpx;font-size: 22rpx;color: #F56C6C;">
                            <view
                                style="text-align: center;line-height: 40rpx;border-radius: 8rpx; width: 158rpx;height: 40rpx;font-size: 22rpx;color: #F56C6C;">
                                å·²å…¥&nbsp;&nbsp;{{item.OverQty}}
                            </view>
                        </view>
@@ -43,7 +48,9 @@
</template>
<script>
    import { InboundOrderStatus } from '../../common/config.js'
    import {
        InboundOrderStatus
    } from '../../common/config.js'
    export default {
        data() {
            return {
@@ -72,6 +79,7 @@
            this.isLoaded = uni.getStorageSync('isLoaded');
            if (this.isLoaded) {
                uni.removeStorageSync('isLoaded');
                this.pageNo = 1;
                // ä»Žå…¶ä»–页面返回时刷新
                this.getData();
            }
@@ -94,6 +102,7 @@
                        pageNo: this.pageNo
                    },
                }
                if (this.pageNo == 1) this.allReceivingOrders = [];
                this.$u.post('/api/CabinOrder/GetCabinOrders', postData).then((res) => {
                    if (res.status) {
                        if (res.data.length > 0) {
@@ -101,8 +110,10 @@
                                this.allReceivingOrders = res.data.map(i => ({
                                    ...i,
                                    InboundOrderStatus: i.odrderStatus.label,
                                    SumQty: i.details.map(item => item.order_qty).reduce((prev, next) => prev + next, 0),
                                    OverQty: i.details.map(item => item.order_Inqty).reduce((prev, next) => prev + next, 0)
                                    SumQty: i.details.map(item => item.order_qty).reduce((prev,
                                        next) => prev + next, 0),
                                    OverQty: i.details.map(item => item.order_Inqty).reduce((prev,
                                        next) => prev + next, 0)
                                }));
                                // this.allReceivingOrders = res.data;
                                if (this.allReceivingOrders.length > 3) {
@@ -114,8 +125,10 @@
                                this.allReceivingOrders = res.data.map(i => ({
                                    ...i,
                                    InboundOrderStatus: i.odrderStatus.label,
                                    SumQty: i.details.map(item => item.order_qty).reduce((prev, next) => prev + next, 0),
                                    OverQty: i.details.map(item => item.order_Inqty).reduce((prev, next) => prev + next, 0)
                                    SumQty: i.details.map(item => item.order_qty).reduce((prev,
                                        next) => prev + next, 0),
                                    OverQty: i.details.map(item => item.order_Inqty).reduce((prev,
                                        next) => prev + next, 0)
                                }));
                                if (this.allReceivingOrders.length > 3) {
                                    this.loadVisible = true;
н¨Îļþ¼Ð/PDA/pages/stash/inboundorderDetail.vue
@@ -33,6 +33,7 @@
            return {
                page: "/pages/stash/raworderboxing?",
                loadVisible: false,
                isIn:false,
                searchValue: "",
                status: "more",
                allReceivingOrders: [],
@@ -48,6 +49,15 @@
            this.allReceivingOrders=res.detail;
            this.page = this.page + "orderNo=" + this.orderNo +"&warehouseId=" + this.warehouseId + "&batchNo=";
            this.getData();
        },
        onShow() {
            this.isIn = uni.getStorageSync('isIn');
            if (this.isIn) {
                uni.removeStorageSync('isIn');
                this.pageNo = 1;
                // ä»Žå…¶ä»–页面返回时刷新
                this.getData();
            }
        },
        onReachBottom() {
            this.pageNo += 1;
@@ -97,6 +107,26 @@
                                this.status = 'noMore';
                                //this.allReceivingOrders = [];
                                this.loadVisible = true;
                                if (this.allReceivingOrders.length < 1) {
                                    uni.showModal({
                                        title: '提示',
                                        content: '入库已完成,是否返回首页?',
                                        success: (res) => {
                                            if (res.confirm) {
                                                uni.setStorageSync('isLoaded', true);
                                                // ç”¨æˆ·ç‚¹å‡»ç¡®å®š
                                                setTimeout(() => {
                                                    uni.navigateBack({
                                                        delta: 2
                                                    });
                                                }, 500);
                                            } else {
                                                // ç”¨æˆ·ç‚¹å‡»å–消,可以停留在当前页面
                                                // æˆ–者执行其他操作
                                            }
                                        }
                                    });
                                }
                            }
                        }
                    })
н¨Îļþ¼Ð/PDA/pages/stash/raworderboxing.vue
@@ -480,7 +480,7 @@
                        this.barcode = "";
                        this.materSn = "";
                        if (this.Inqty == this.orderqty) {
                            uni.setStorageSync('isLoaded', true);
                            uni.setStorageSync('isIn', true);
                            this.handleInboundComplete();
                        }
                    } else {
@@ -533,7 +533,7 @@
                // });
                // æ–¹å¼1:使用uni.navigateBack返回上一页
                    uni.navigateBack({
                        delta: 2
                        delta: 1
                    });
                }, 600);
            }
н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json
@@ -16,7 +16,7 @@
  //"ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWMS_HUAIAN;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //"ConnectionString": "Data Source=10.30.4.92;Initial Catalog=WMS_TC;User ID=sa;Password=duo123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //旧WMS数据库连接
  "ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WMSDBF_Z22;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  "ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WMSDBF_Z22;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //跨域
  "Cors": {
    "PolicyName": "CorsIpAccess", //策略名称
ÏîÄ¿×ÊÁÏ/Ò½Ò©ÏîĿϵͳWMS £¨ÉÏÓÎ)ÎÊÌâµã.xlsx
Binary files differ