Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

wangyi

2026-03-13 d126ed87646bede838e8d0e41bedd4fb0e9db6fe

Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

 manifest.json

@@ -2,8 +2,8 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",
    "versionName" : "2.092",
    "versionCode" : 292,
    "versionName" : "2.091",
    "versionCode" : 291,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {

 pages/ZLGL/Gy_MaterialPrevention/Gy_MaterialPrevention.vue

@@ -83,14 +83,17 @@
                    <uni-card :title="item.HBarCode" style="margin: 10px;"
                        @tap="showDetail = showDetail==index?-1:index">
                        <view class="card-detail">
                            <view class="detail" v-if="item.物料代码">
                                <text>物料编码：</text>{{item.物料代码}}
                            <view class="detail" v-if="item.HMaterNumber">
                                <text>物料编码：</text>{{item.HMaterNumber}}
                            </view>
                            <view class="detail" v-if="item.物料名称">
                                <text>物料名称：</text>{{item.物料名称}}
                            <view class="detail" v-if="item.HMaterName">
                                <text>物料名称：</text>{{item.HMaterName}}
                            </view>
                            <view class="detail" v-if="item.HMaterModel">
                                <text>规则型号：</text>{{item.HMaterModel}}
                            </view>
                            <view class="detail" v-if="item.计量单位">
                                <text>计量单位：</text>{{item.计量单位}}
                            </view>
                            <view class="detail" v-if="item.HQty">
                                <text>投料数量：</text>{{item.HQty}}
@@ -339,6 +342,9 @@
                        data[0]["HScanDate"] = dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss")
                        CommonUtils.playSound(1)
                        this.tabs = 1
                        console.log(this.HMaterList);
                        console.log(this.HMaterList[findIndex]["物料代码"]);
                        data[0]["计量单位"] = this.HMaterList[findIndex]["计量单位"];//获取计量单位
                        this.HMaterUpperList.push(data[0])
                        this.refreshHMaterCodeFocus()
                    } else {