Commit Graph

659 Commits

Author SHA1 Message Date
sliang 950f125032 Merge remote-tracking branch 'origin/dev' into dev 2023-12-24 00:48:06 +08:00
sliang 06222113d5 工机具管理-库管员配置;维修班配置 2023-12-24 00:47:55 +08:00
bns_han 83d624bec2 app-退料接收 2023-12-24 00:47:35 +08:00
bns_han d5a90a5b64 Merge remote-tracking branch 'origin/dev' into dev 2023-12-24 00:46:19 +08:00
bns_han 69097feb30 app-退料接收 2023-12-24 00:46:08 +08:00
dingjie 17a9c7d8a0 机具设备管理模糊搜索 2023-12-24 00:44:11 +08:00
dingjie f5d239e879 Merge remote-tracking branch 'origin/dev' into dev 2023-12-24 00:39:38 +08:00
dingjie f4a5421257 机具设备管理模糊搜索 2023-12-24 00:39:26 +08:00
syruan a83d09f0d4 Merge remote-tracking branch 'devVPN/dev' into dev 2023-12-24 00:33:27 +08:00
bns_han 69d37909db app-退料接收 2023-12-24 00:32:10 +08:00
syruan f0254a5f3d QRCODE判断修正 2023-12-24 00:31:04 +08:00
dingjie 2085686f96 Merge remote-tracking branch 'origin/dev' into dev 2023-12-24 00:24:37 +08:00
dingjie 05949b9692 增加入库任务详细记录表 2023-12-24 00:24:23 +08:00
zhouzy062 f90f5bea54 机具管理问题修改 2023-12-24 00:15:02 +08:00
dingjie cc0bb3e292 Merge remote-tracking branch 'origin/dev' into dev 2023-12-24 00:13:25 +08:00
dingjie 2a717dbea1 增加入库任务详细记录表 2023-12-24 00:13:14 +08:00
sliang c0a7eebdda Merge remote-tracking branch 'origin/dev' into dev 2023-12-23 23:33:59 +08:00
zhouxain01 82ffd828c1 Merge remote-tracking branch 'origin/dev' into dev 2023-12-23 23:24:42 +08:00
zhouxain01 922f246362 提交退库相关代码 2023-12-23 23:24:35 +08:00
cwchen 726fc6d996 Merge remote-tracking branch 'origin/dev' into dev 2023-12-23 23:17:43 +08:00
cwchen 5ae2f1679f 大屏接口修改 2023-12-23 23:17:12 +08:00
dingjie 86c6b25f5d Merge remote-tracking branch 'origin/dev' into dev 2023-12-23 23:09:27 +08:00
dingjie 5a49a44693 数据回滚问题 2023-12-23 23:09:17 +08:00
gmhao 0ad1ac019d 修改往来单位 2023-12-23 22:52:36 +08:00
bns_han 272bce65c7 后台-退料申请与审核 2023-12-23 22:32:38 +08:00
bns_han b15f613f82 后台-退料申请与审核 2023-12-23 22:30:03 +08:00
sliang 11aef851d9 工机具管理-库管员配置;维修班配置 2023-12-23 21:49:43 +08:00
zhouzy062 891246c5a9 新购机具问题修改 2023-12-23 21:41:58 +08:00
gmhao df5d92ef99 新增二维码 状态 2023-12-23 21:33:04 +08:00
dingjie 8ae7102597 Merge remote-tracking branch 'origin/dev' into dev 2023-12-23 21:31:37 +08:00
dingjie 91943ddfb4 机具编码标签绑定 2023-12-23 21:31:33 +08:00
gmhao ec1824b586 新增二维码 状态 2023-12-23 21:13:17 +08:00
dingjie 5897142cc5 Merge remote-tracking branch 'origin/dev' into dev 2023-12-23 20:53:06 +08:00
dingjie fa9ad0f28f 机具编码标签绑定 2023-12-23 20:52:59 +08:00
bns_han e9e96526d6 后台-退料申请与审核 2023-12-23 20:24:10 +08:00
bns_han bc9dfc589e 后台-退料申请与审核 2023-12-23 20:17:03 +08:00
wlikett 419cf70b3b 领料申请管理2 2023-12-23 19:51:46 +08:00
zhouzy062 5aeed17564 前端问题修改 2023-12-23 19:42:57 +08:00
dingjie b6bd220662 上传文件生成名称规则修改 2023-12-23 19:33:37 +08:00
dingjie a47c83e0aa Merge remote-tracking branch 'origin/dev' into dev 2023-12-23 18:50:28 +08:00
dingjie 83ac831e0a 机具修改 2023-12-23 18:50:18 +08:00
wlikett fd12bca625 领料申请管理 2023-12-23 18:42:25 +08:00
sliang 3718c45b4d 工机具管理-库管员配置;维修班配置 2023-12-23 18:32:23 +08:00
sliang aba4aeb58f Merge remote-tracking branch 'origin/dev' into dev 2023-12-23 18:30:42 +08:00
gmhao 19a23f3bf8 新增校验 2023-12-23 17:35:43 +08:00
gmhao e8faf72541 新增校验 2023-12-23 17:02:17 +08:00
syruan 7b0c928309 修正判断逻辑 2023-12-23 16:48:05 +08:00
zhouzy062 3aa081ddd0 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2023-12-23 16:04:01 +08:00
zhouzy062 58bce3e6a3 新购机具代码提交 2023-12-23 16:03:15 +08:00
dingjie c6c96dec3c Merge remote-tracking branch 'origin/dev' into dev 2023-12-23 15:58:09 +08:00