wangxinhui
2025-01-10 0e24030858b439e0c437a017fdaabecd75af0e92
Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

# Conflicts:
# 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs
# 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs
已修改1个文件
22 ■■■■ 文件已修改
代码管理/淮安PDA/pages/stash/pickingMat.vue 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/淮安PDA/pages/stash/pickingMat.vue
@@ -15,24 +15,22 @@
                        </uni-forms-item>
                    </uni-forms>
                    <uni-list>
                        <uni-list-item direction="column" v-for="item in matInfos" :key="item.sn">
                        <uni-list-item direction="column" v-for="item in matInfos" :key="item.palletCode">
                            <template v-slot:body>
                                <view class="uni-list-box">
                                    <!-- <uni-icons type="trash" size="22" style="position: absolute;right: 5%;"
                                        @click="deleteList(item.sn)">
                                    </uni-icons> -->
                                    <view class="uni-content">
                                        <view class="uni-title-sub uni-ellipsis-2">鍗曟嵁缂栧彿锛歿{item.orderNo}}</view>
                                        <view class="uni-note">鎵樼洏缂栧彿锛歿{item.palletCode}}</view>
                                        <view class="uni-note">鐗╂枡鎵规锛歿{item.batchNo}}</view>
                                        <view class="uni-note">鐗╂枡缂栫爜锛歿{item.materielCode}}</view>
                                        <view class="uni-note">鐗╂枡鍚嶇О锛歿{item.materielName}}</view>
                                        <view class="uni-note">鍗曟嵁鏁伴噺锛歿{item.orderQuantity}}</view>
                                        <view class="uni-note">鍘熷搴撳瓨锛歿{item.originalQuantity}}</view>
                                        <view class="uni-note">鍒嗛厤搴撳瓨锛歿{item.assignQuantity}}</view>
                                        <view class="uni-note">鍓╀綑搴撳瓨锛歿{item.originalQuantity-item.assignQuantity}}</view>
                                        <view>鍗曟嵁缂栧彿锛歿{item.orderNo}}</view>
                                        <view>鎵樼洏缂栧彿锛歿{item.palletCode}}</view>
                                        <view>鐗╂枡鎵规锛歿{item.batchNo}}</view>
                                        <view>鐗╂枡缂栫爜锛歿{item.materielCode}}</view>
                                        <view>鐗╂枡鍚嶇О锛歿{item.materielName}}</view>
                                        <view>鍗曟嵁鏁伴噺锛歿{item.orderQuantity}}</view>
                                        <view>鍘熷搴撳瓨锛歿{item.originalQuantity}}</view>
                                        <view>鍒嗛厤搴撳瓨锛歿{item.assignQuantity}}</view>
                                        <view>鍓╀綑搴撳瓨锛歿{item.originalQuantity-item.assignQuantity}}</view>
                                    </view>
                                </view>
                            </template>
                        </uni-list-item>
                    </uni-list>