chenhaozhe
2025-09-01 e7e65571bd75e7f8aa20ee2e151e77af824fabc0
添加 条码已存在时 计算 条码数量和每箱数量
5个文件已修改
833 ■■■■■ 已修改文件
.hbuilderx/launch.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
components/blueToothConnector/blueToothConnector.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages.json 807 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/tiaomaguanli/table_son.vue 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/xiaoshouchuku/form.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.hbuilderx/launch.json
@@ -25,7 +25,7 @@
            "localRepoPath" : "D:/WorkBench/ZY_APP_Dev/STUWMS/unpackage/debug",
            "openVueDevtools" : true,
            "packageName" : "com.shebeiguanli.www",
            "playground" : "standard",
            "playground" : "custom",
            "type" : "uni-app:app-android"
        }
    ]
components/blueToothConnector/blueToothConnector.vue
@@ -202,14 +202,12 @@
                })
                // console.log("msg: " + cmd);
                let toast = (msg) => {
                    uni.hideLoading()
                    uni.showToast({
                        icon: 'none',
                        title: msg,
                        duration: 2000
                    })
                    setTimeout(() => {
                        uni.hideLoading()
                    }, 3000)
                }
                let that = this
                return new Promise((resolve, reject) => {
pages.json
@@ -737,7 +737,37 @@
            {
                "navigationBarTitleText" : "修改密码"
            }
        }
        },{
            "path": "pages/jishikucunchaxun/table",
            "style": {
                "navigationBarTitleText": "ERP及时库存查询"
                // "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/weiwairuku/table",
            "style": {
                "navigationBarTitleText": "委外入库"
            }
        },
        {
            "path": "pages/weiwairuku/form",
            "style": {
                "navigationBarTitleText": "委外入库单"
            }
        },
        {
            "path": "pages/tiaomaguanli/table",
            "style": {
                "navigationBarTitleText": "条码管理"
            }
        },
        {
            "path": "pages/tiaomaguanli/table_son",
            "style": {
                "navigationBarTitleText": "条码生成"
            }
        }
    ],
    "tabBar": {
        "color": "#888888", //tab 上的文字默认颜色,仅支持十六进制颜色
@@ -778,779 +808,4 @@
        "pageOrientation": "default"
    },
    "uniIdRouter": {}
=======
            "style": {
                "navigationBarTitleText": "登录",
                "navigationStyle": "custom"
            }
        },
        {
            "path": "pages/index/index",
            "style": {
                "navigationBarTitleText": "首页",
                "navigationStyle": "custom"
            }
        },
        {
            "path": "pages/index/tab1",
            "style": {
                "navigationBarTitleText": "车间工序"
            }
        },
        {
            "path": "pages/index/tab2",
            "style": {
                "navigationBarTitleText": "单据列表"
            }
        },
        {
            "path": "pages/index/mine",
            "style": {
                "navigationBarTitleText": "个人中心",
                // "navigationStyle": "custom"
                "navigationBarTextStyle": "white",
                "navigationBarBackgroundColor": "#65a2fb"
            }
        },
        {
            "path": "pages/shebeilvli/form",
            "style": {
                "navigationBarTitleText": "设备状态分析"
            }
        },
        {
            "path": "pages/shebeilvli/table",
            "style": {
                "navigationBarTitleText": "设备履历",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/shebeilvli/table_son",
            "style": {
                "navigationBarTitleText": "设备履历子表"
            }
        },
        {
            "path": "pages/baoyangjihua/form",
            "style": {
                "navigationBarTitleText": "设备保养计划单"
            }
        },
        {
            "path": "pages/baoyangjihua/table",
            "style": {
                "navigationBarTitleText": "设备保养计划单",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/baoyangjihua/table_son",
            "style": {
                "navigationBarTitleText": "保养计划子表"
            }
        },
        {
            "path": "pages/baoyangjilu/form",
            "style": {
                "navigationBarTitleText": "设备保养记录单"
            }
        },
        {
            "path": "pages/baoyangjilu/table",
            "style": {
                "navigationBarTitleText": "设备保养记录单",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/baoyangjilu/table_son",
            "style": {
                "navigationBarTitleText": "保养记录子表"
            }
        },
        {
            "path": "pages/guzhangdengji/form",
            "style": {
                "navigationBarTitleText": "设备故障登记表"
            }
        },
        {
            "path": "pages/guzhangdengji/table",
            "style": {
                "navigationBarTitleText": "设备故障登记表",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/shebeidangan/form",
            "style": {
                "navigationBarTitleText": "设备档案"
            }
        },
        {
            "path": "pages/shebeidangan/table",
            "style": {
                "navigationBarTitleText": "设备档案",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/shebeiweixiu/form",
            "style": {
                "navigationBarTitleText": "设备维修记录单"
            }
        },
        {
            "path": "pages/shebeiweixiu/table",
            "style": {
                "navigationBarTitleText": "设备维修记录单",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/weiwaigxIn/form",
            "style": {
                "navigationBarTitleText": "委外工序发出单"
            }
        },
        {
            "path": "pages/weiwaigxIn/table",
            "style": {
                "navigationBarTitleText": "委外工序发出单",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/weiwaigxOut/form",
            "style": {
                "navigationBarTitleText": "委外工序接收单"
            }
        },
        {
            "path": "pages/weiwaigxOut/table",
            "style": {
                "navigationBarTitleText": "委外工序接收单",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/weiwaigxOut/firstCheck",
            "style": {
                "navigationBarTitleText": "首件检验单",
                "enablePullDownRefresh": true
            }
        }, {
            "path": "pages/gongxuIn/form",
            "style": {
                "navigationBarTitleText": "工序进站接收单"
            }
        },
        {
            "path": "pages/gongxuIn/table",
            "style": {
                "navigationBarTitleText": "工序进站接收单",
                "enablePullDownRefresh": true
            }
        }, {
            "path": "pages/gongxuOut/form",
            "style": {
                "navigationBarTitleText": "工序出站汇报单"
            }
        },
        {
            "path": "pages/gongxuOut/table",
            "style": {
                "navigationBarTitleText": "工序出站汇报单",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/shebeiguanli/form",
            "style": {
                "navigationBarTitleText": "设备管理",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/shebeiguanli/table",
            "style": {
                "navigationBarTitleText": "设备管理",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/shebeiguanli/list",
            "style": {
                "navigationBarTitleText": "工单列表",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/baogong/form",
            "style": {
                "navigationBarTitleText": "产量汇报单",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/baogong/table",
            "style": {
                "navigationBarTitleText": "报工平台",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/baogong/list",
            "style": {
                "navigationBarTitleText": "工单列表",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/baogong/abnormal",
            "style": {
                "navigationBarTitleText": "异常反馈单",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/yichang/table",
            "style": {
                "navigationBarTitleText": "异常反馈单列表",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/yichang/form",
            "style": {
                "navigationBarTitleText": "异常反馈单",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/yichang/list",
            "style": {
                "navigationBarTitleText": "异常反馈处理单列表",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/caigouruku/form",
            "style": {
                "navigationBarTitleText": "采购入库单",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/caigoutuiliao/form",
            "style": {
                "navigationBarTitleText": "采购退料单",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/xiaoshouchuku/table",
            "style": {
                "navigationBarTitleText": "销售出库列表",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/xiaoshouchuku/form",
            "style": {
                "navigationBarTitleText": "销售出库单",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/xiaoshoutuihuo/table",
            "style": {
                "navigationBarTitleText": "销售退货列表",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/xiaoshoutuihuo/form",
            "style": {
                "navigationBarTitleText": "销售退货单",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/shouliaotongzhi/table",
            "style": {
                "navigationBarTitleText": "收料通知单",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/shouliaotongzhi/table_son",
            "style": {
                "navigationBarTitleText": "条码生成",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/shengchanlingliao/table",
            "style": {
                "navigationBarTitleText": "生产领料校验列表",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/shengchanlingliao/form",
            "style": {
                "navigationBarTitleText": "生产领料单校验",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/shengchanruku/table",
            "style": {
                "navigationBarTitleText": "生产入库校验列表",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/shengchanruku/form",
            "style": {
                "navigationBarTitleText": "生产入库单校验",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/shengchandiaobo/table",
            "style": {
                "navigationBarTitleText": "生产调拨校验列表",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/shengchandiaobo/form",
            "style": {
                "navigationBarTitleText": "生产调拨单校验",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/labelPrinter/index",
            "style": {
                "navigationBarTitleText": "标签打印"
            }
        },
        {
            "path": "pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai",
            "style": {
                "navigationBarTitleText": "设备运行状态",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/shebeiyunxingzhuangtai/detail",
            "style": {
                "navigationBarTitleText": "设备运行状态详情"
            }
        },
        {
            "path": "pages/mujvzhuangtai/mujvzhuangtai",
            "style": {
                "navigationBarTitleText": "模具状态分布",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/mujvzhuangtai/detail",
            "style": {
                "navigationBarTitleText": "模具状态详情"
            }
        },
        {
            "path": "pages/tiaomachaima/tiaomachaima",
            "style": {
                "navigationBarTitleText": "条码拆码"
            }
        },
        {
            "path": "pages/wuliaosaoma/wuliaosaoma",
            "style": {
                "navigationBarTitleText": "物料清单"
            }
        },
        {
            "path": "pages/wuliaosaoma/detail",
            "style": {
                "navigationBarTitleText": "条码档案"
            }
        },
        {
            "path": "pages/caigouruku/table",
            "style": {
                "navigationBarTitleText": "采购入库",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/caigoutuiliao/table",
            "style": {
                "navigationBarTitleText": "采购退料",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/caigoutuiliao/form",
            "style": {
                "navigationBarTitleText": "采购退料单"
            }
        },
        {
            "path": "pages/xiaoshouchuku/table",
            "style": {
                "navigationBarTitleText": "销售出库",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/xiaoshouchuku/form",
            "style": {
                "navigationBarTitleText": "销售出库单"
            }
        },
        {
            "path": "pages/xiaoshoutuihuo/table",
            "style": {
                "navigationBarTitleText": "销售退货",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/xiaoshoutuihuo/form",
            "style": {
                "navigationBarTitleText": "销售退货单"
            }
        },
        {
            "path": "pages/qitachuku/qitachuku",
            "style": {
                "navigationBarTitleText": "其他出库",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/qitachuku/form",
            "style": {
                "navigationBarTitleText": "其他出库单"
            }
        },
        {
            "path": "pages/qitaruku/qitaruku",
            "style": {
                "navigationBarTitleText": "其他入库",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/qitaruku/form",
            "style": {
                "navigationBarTitleText": "其他入库单"
            }
        },
        {
            "path": "pages/tiaomadaying/tiaomadaying",
            "style": {
                "navigationBarTitleText": "采购条码打印"
            }
        },
        {
            "path": "pages/caigoudingdan/generate",
            "style": {
                "navigationBarTitleText": "条码生成"
            }
        },
        {
            "path": "pages/caigoudingdan/caigoudingdan",
            "style": {
                "navigationBarTitleText": "采购订单"
            }
        },
        {
            "path": "pages/MJGL/shangmudan/table",
            "style": {
                "navigationBarTitleText": "上模单"
            }
        },
        {
            "path": "pages/MJGL/shangmudan/form",
            "style": {
                "navigationBarTitleText": "上模单"
            }
        },
        {
            "path": "pages/qitachukujiaoyan/qitachukujiaoyan",
            "style": {
                "navigationBarTitleText": "其他出库校验",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/qitachukujiaoyan/detail",
            "style": {
                "navigationBarTitleText": "其他出库单校验"
            }
        },
        {
            "path": "pages/shengchanbuliaojiaoyan/CacheList",
            "style": {
                "navigationBarTitleText": "生产补料校验",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/shengchanbuliaojiaoyan/form",
            "style": {
                "navigationBarTitleText": "生产补料单校验"
            }
        },
        {
            "path": "pages/xiaoshouchukujiaoyan/table",
            "style": {
                "navigationBarTitleText": "销售出库校验",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/xiaoshouchukujiaoyan/form",
            "style": {
                "navigationBarTitleText": "销售出库单校验"
            }
        },
        {
            "path": "pages/weiwailingliaojiaoyan/table",
            "style": {
                "navigationBarTitleText": "委外领料校验",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/weiwailingliaojiaoyan/form",
            "style": {
                "navigationBarTitleText": "委外领料单校验"
            }
        },
        {
            "path": "pages/caigourukujiaoyan/table",
            "style": {
                "navigationBarTitleText": "采购入库校验",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/caigourukujiaoyan/form",
            "style": {
                "navigationBarTitleText": "采购入库单校验",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/qitarukujiaoyan/table",
            "style": {
                "navigationBarTitleText": "其他入库校验",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/qitarukujiaoyan/form",
            "style": {
                "navigationBarTitleText": "其他入库单校验"
            }
        },
        {
            "path": "pages/weiwaibuliaojiaoyan/table",
            "style": {
                "navigationBarTitleText": "委外补料校验",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/weiwaibuliaojiaoyan/form",
            "style": {
                "navigationBarTitleText": "委外补料单校验"
            }
        },
        {
            "path": "pages/shengchanlingliaoshengdan/table",
            "style": {
                "navigationBarTitleText": "生产领料",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/shengchanlingliaoshengdan/form",
            "style": {
                "navigationBarTitleText": "生产领料单"
            }
        },
        {
            "path": "pages/weiwailingliao/table",
            "style": {
                "navigationBarTitleText": "委外领料",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/weiwailingliao/form",
            "style": {
                "navigationBarTitleText": "委外领料单"
            }
        },
        {
            "path": "pages/shengchanrukushengdan/table",
            "style": {
                "navigationBarTitleText": "生产入库",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/shengchanrukushengdan/form",
            "style": {
                "navigationBarTitleText": "生产入库单"
            }
        },
        {
            "path": "pages/shengchanbuliao/table",
            "style": {
                "navigationBarTitleText": "生产补料",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/shengchanbuliao/form",
            "style": {
                "navigationBarTitleText": "生产补料单"
            }
        },
        {
            "path": "pages/qitaruku_v2/table",
            "style": {
                "navigationBarTitleText": "其他入库",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/qitaruku_v2/form",
            "style": {
                "navigationBarTitleText": "其他入库单"
            }
        },
        {
            "path": "pages/qitachuku_v2/table",
            "style": {
                "navigationBarTitleText": "其他出库",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/qitachuku_v2/form",
            "style": {
                "navigationBarTitleText": "其他出库单"
            }
        },
        {
            "path": "pages/zhijiediaobo/table",
            "style": {
                "navigationBarTitleText": "直接调拨",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/zhijiediaobo/form",
            "style": {
                "navigationBarTitleText": "直接调拨单"
            }
        },
        {
            "path": "pages/xiugaimima/index",
            "style": {
                "navigationBarTitleText": "修改密码"
            }
        },
        {
            "path": "pages/jishikucunchaxun/table",
            "style": {
                "navigationBarTitleText": "ERP及时库存查询"
                // "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/weiwairuku/table",
            "style": {
                "navigationBarTitleText": "委外入库"
            }
        },
        {
            "path": "pages/weiwairuku/form",
            "style": {
                "navigationBarTitleText": "委外入库单"
            }
        },
        {
            "path": "pages/tiaomaguanli/table",
            "style": {
                "navigationBarTitleText": "条码管理"
            }
        },
        {
            "path": "pages/tiaomaguanli/table_son",
            "style": {
                "navigationBarTitleText": "条码生成"
            }
        },
        {
            "path" : "pages/saomachuku/table",
            "style" :
            {
                "navigationBarTitleText" : "扫码出库",
                "enablePullDownRefresh": true
            }
        }
    ],
    "tabBar": {
        "color": "#888888", //tab 上的文字默认颜色,仅支持十六进制颜色
        "selectedColor": "#2d7dee", //tab 上的文字选中时的颜色,仅支持十六进制颜色
        "borderStyle": "black", //tabbar上边框的颜色, 仅支持 black / white
        "backgroundColor": "#ffffff", //tab 的背景色,仅支持十六进制颜色
        "list": [{
                "pagePath": "pages/index/index",
                "iconPath": "static/tabBar/home.png",
                "selectedIconPath": "static/tabBar/home-default.png",
                "text": "仓储管理"
            },
            {
                "pagePath": "pages/index/tab1",
                "iconPath": "static/tabBar/icon1.png",
                "selectedIconPath": "static/tabBar/icon1-default.png",
                "text": "车间工序"
            },
            {
                "pagePath": "pages/index/tab2",
                "iconPath": "static/tabBar/icon2.png",
                "selectedIconPath": "static/tabBar/icon2-default.png",
                "text": "单据列表"
            },
            {
                "pagePath": "pages/index/mine",
                "iconPath": "static/tabBar/user.png",
                "selectedIconPath": "static/tabBar/user-default.png",
                "text": "我的"
            }
        ]
    },
    "globalStyle": {
        "navigationBarTextStyle": "white",
        "navigationBarTitleText": "设备管理",
        "navigationBarBackgroundColor": "#3A78FF",
        "backgroundColor": "#F8F8F8",
        "pageOrientation": "default"
    },
    "uniIdRouter": {}
}
pages/tiaomaguanli/table_son.vue
@@ -55,7 +55,7 @@
                <!-- <button class="btn-c" size="mini" type="default" @tap="searchLabelPrinter()">搜索打印机</button> -->
                <!-- :disabled="codeGenComplete == false" -->
                <button :class="codeGenComplete == false? 'btn-a': 'btn-c'" size="mini" type="default"
                    @tap="search">打印</button>
                  :disabled="codeGenComplete == false"  @tap="search">打印</button>
            </view>
        </view>
@@ -329,6 +329,10 @@
                var HSourceBillType = "收料通知单";
                //获取选择的条码类型
                var HSelectBarCodeType = "唯一条码";
                if(uni.getStorageSync('Organization').includes('海诚')){
                    HSelectBarCodeType = "品种条码";
                }
                //获取当前登录人员
                var UserName = uni.getStorageSync('HUserName');
                let listDataTemp = []
@@ -401,7 +405,14 @@
                                          HBarCodeNo: item['HBarCode'],
                                          HInterID: item['HInterID']
                                      })
                                })
                                this.baseInfo.HBQty = res.data.data.length
                                this.baseInfo.HMinQty = Math.ceil(this.baseInfo.HQty /  res.data.data.length)
                                this.codeGenComplete = true
                                uni.showToast({
                                    title: res.data.Message,
                                    icon: 'none'
                                })
                            }else {
                                this.codeGenComplete = true
@@ -565,7 +576,7 @@
                            HBillInterID: this.linterid,
                            HBillEntryID: this.HEntryID,
                            HViewName: 'h_v_IF_POInStockBillList',
                            HBillSubType: '1203',
                            HBillSubType: '1103',
                            HInterID: HInterID
                        },
                        resFunction: (res) => {
pages/xiaoshouchuku/form.vue
@@ -401,7 +401,8 @@
        computed: {
            enableModule: {
                get() {
                    if (this.hform.HMainSourceBillType == 1402) {
                    console.log('typeof(Organization): ',typeof(uni.getStorageSync('Organization')));
                    if (this.hform.HMainSourceBillType == 1402 && uni.getStorageSync('Organization').includes('兴达')) {
                        return 1
                    } else {
                        return 2