Commit Graph
92 Commits
Author SHA1 Message Date
zhou-hongcheng 6b3c73f25a 同一货主可以在多个仓库进行租赁 2026-03-02 09:10:20 +08:00
zhou-hongcheng b5285d9ebb 创建时间创建人优化 2026-02-28 17:16:59 +08:00
zhou-hongcheng 5377016c18 Merge remote-tracking branch 'origin/dev' into dev 2026-02-28 17:12:50 +08:00
zhou-hongcheng c6484779ea 散租推送优化 2026-02-28 17:08:48 +08:00
zhou-hongcheng 5ed4ded0bd 角色改为客户 2026-02-27 16:01:26 +08:00
zhou-hongcheng 43e9f68ac1 Merge remote-tracking branch 'origin/dev' into dev 2026-02-27 15:57:29 +08:00
zhou-hongcheng 1176add6ad 新增货主业务类型改为托运业务 2026-02-27 15:55:20 +08:00
zhou-hongcheng aa5fb467f8 Merge remote-tracking branch 'origin/dev' into dev 2026-02-27 14:04:56 +08:00
zhou-hongcheng f9fb210047 移位完成后库存上的货主、净重、毛重、体积、面积都没有了bug修改 2026-02-27 13:59:25 +08:00
zhou-hongcheng bb6ecf4651 新增移位保存净重(KG)、毛重(KG)、体积(CBM)、面积(SQM) 2026-02-27 10:18:47 +08:00
zhou-hongcheng d266742b28 Merge remote-tracking branch 'origin/dev' into dev 2026-02-27 09:40:15 +08:00
zhou-hongcheng 54cd738bd6 新增移位保存净重(KG)、毛重(KG)、体积(CBM)、面积(SQM) 2026-02-27 09:40:02 +08:00
zhou-hongcheng 961d8a462d 新增物料时使用传入的组织表ID 2026-02-26 17:38:59 +08:00
zhou-hongcheng 442f95cbc6 流水汇总达梦sql不支持别名 2026-02-26 15:54:15 +08:00
zhou-hongcheng cc56ae5f2f Merge remote-tracking branch 'origin/dev' into dev 2026-02-26 15:18:45 +08:00
zhou-hongcheng a074205643 物料分类回显 2026-02-26 15:18:30 +08:00
zhou-hongcheng 90b701c1f3 Merge remote-tracking branch 'origin/dev' into dev 2026-02-26 09:37:03 +08:00
zhou-hongcheng 9621deccf1 wms租赁定时任务推送到bms(把获取当前登录人的一级id改为参数传入) 2026-02-26 09:36:53 +08:00
zhou-hongcheng 2a570fbefc wms租赁定时任务推送到bms(未完成 定时任务没有当前登录人 需要改造后面方法) 2026-02-25 19:56:10 +08:00
zhou-hongcheng d4cbbd17cc Merge remote-tracking branch 'origin/dev' into dev 2026-02-25 11:01:23 +08:00
zhou-hongcheng a6aa766f3c 合同管理增加客户类型字段 2026-02-25 11:01:12 +08:00
zhou-hongcheng 6ec0e5b3f5 Merge remote-tracking branch 'origin/dev' into dev 2026-02-25 09:50:40 +08:00
zhou-hongcheng 219db303d0 费用类别查询的时候过滤已经删除的内容 2026-02-25 09:50:29 +08:00
zhou-hongcheng d6cd44b076 Merge remote-tracking branch 'origin/dev' into dev 2026-02-24 16:25:24 +08:00
zhou-hongcheng cd959bba91 收款记录sql拼接函数问题 2026-02-24 16:24:25 +08:00
zhou-hongcheng 4fce6f7c4f Merge remote-tracking branch 'origin/dev' into dev 2026-02-24 16:20:05 +08:00
zhou-hongcheng cf561f2269 结算对象页面增加查询条件 2026-02-24 16:19:54 +08:00
zhou-hongcheng 4b85f3420e Merge remote-tracking branch 'origin/dev' into dev 2026-02-24 14:59:26 +08:00
zhou-hongcheng 8ad6883ec0 修改结算对象bug再次同步数据时,已存在的数据不再重复新增 2026-02-24 14:59:13 +08:00
zhou-hongcheng 38b4595d9d 修改流水总汇达梦数据库不支持GROUP_CONCAT函数sql报错问题 2026-02-24 13:43:56 +08:00
zhou-hongcheng 7974fefd96 Merge remote-tracking branch 'origin/wms_dev' into wms_dev 2026-02-06 16:31:09 +08:00
zhou-hongcheng 42ec30eb42 pda增加承运商 2026-02-06 13:58:00 +08:00
zhou-hongcheng fc1ddec2ba 物料条码模糊查询 2026-02-06 13:08:48 +08:00
zhou-hongcheng 5acc1059c1 货主管理查询条件优化 2026-02-06 11:12:39 +08:00
zhou-hongcheng d9e5d5187e 根据仓库id过滤列表,根据仓库id查询仓库名称 2026-02-06 10:55:36 +08:00
zhou-hongcheng 1e6173c74f 交接作业单pad内容补充 2026-02-06 10:03:27 +08:00
zhou-hongcheng 3e178a53ff Merge branch 'dev_lzh_wms_20260120' into wms_dev 2026-02-05 19:29:00 +08:00
zhou-hongcheng 28afb0b8dc 1.上架单详情页添加字段
2.交接作业单pad内容补充
2026-02-05 19:28:29 +08:00
zhou-hongcheng 459ac0a809 Merge branch 'dev_lzh_wms_20260120' into wms_dev 2026-02-05 10:48:32 +08:00
zhou-hongcheng da439c9127 任务下发选择用户只显示当前用户登录的仓库已经绑定的账号 2026-02-05 10:33:36 +08:00
zhou-hongcheng e6244b94fe Merge branch 'dev_lzh_wms_20260120' into wms_dev 2026-02-04 16:59:57 +08:00
zhou-hongcheng d58411eef9 app获取详情接口和pc保持一致 2026-02-04 16:04:18 +08:00
zhou-hongcheng 06830c2fc1 pda交接作业单图片上传并出库 2026-02-04 13:46:33 +08:00
zhou-hongcheng a7e0a00d88 Merge remote-tracking branch 'origin/wms_dev' into wms_dev 2026-02-04 10:41:51 +08:00
zhou-hongcheng 8cfd6d435a pda交接作业单图片上传 2026-02-04 10:41:35 +08:00
zhou-hongcheng 4cbb338425 Merge branch 'dev_lzh_wms_20260120' into wms_dev 2026-02-04 09:37:14 +08:00
zhou-hongcheng b8e61e097b pda库存查询报错bug修改 2026-02-04 09:36:10 +08:00
zhou-hongcheng 910e1bac83 Merge branch 'dev_lzh_wms_20260120' into wms_dev 2026-02-03 16:08:54 +08:00
zhou-hongcheng 0194adc794 修改密码后不能用新密码登录bug 2026-02-03 14:30:54 +08:00
zhou-hongcheng 60825ebe9d Merge remote-tracking branch 'origin/wms_dev' into wms_dev 2026-02-02 15:56:15 +08:00
zhou-hongcheng 9b9ea1c0a5 Merge branch 'dev_lzh_wms_20260120' into wms_dev 2026-02-02 15:55:58 +08:00
zhou-hongcheng 38e7606a71 移位管理详情位置信息错误bug 2026-02-02 15:54:07 +08:00
zhou-hongcheng 56db83a80d Merge branch 'dev_lzh_wms_20260120' into wms_dev 2026-02-02 14:53:02 +08:00
zhou-hongcheng 6af1bd8aa0 移位管理修改和新增共用同一个方法bug修改 2026-02-02 14:52:24 +08:00
zhou-hongcheng 440129373c 交接作业单任务下发优化 2026-02-02 09:27:51 +08:00
zhou-hongcheng ef698c2fa1 Merge branch 'dev_lzh_wms_20260120' into wms_dev 2026-01-30 17:52:24 +08:00
zhou-hongcheng caf926f503 交接作业单任务下发 2026-01-30 17:51:44 +08:00
zhou-hongcheng 7644dc8fc5 任务列表转交 2026-01-30 16:53:51 +08:00
zhou-hongcheng 43b3773e3e Merge branch 'dev_lzh_wms_20260120' into wms_dev 2026-01-30 09:15:39 +08:00
zhou-hongcheng 480d50f9da 货主租赁明细批量修改 2026-01-30 09:15:05 +08:00
zhou-hongcheng 52779f0196 Merge branch 'dev_lzh_wms_20260120' into wms_dev 2026-01-29 14:46:31 +08:00
zhou-hongcheng db86df135a 仓库出租率功能模块 2026-01-29 14:44:27 +08:00
zhou-hongcheng b72134a936 租赁管理补充仓库和货主字段 2026-01-28 14:34:19 +08:00
zhou-hongcheng d25a957f13 盘点管理编辑删除子项bug 2026-01-27 10:37:11 +08:00
zhou-hongcheng 714bb1cce4 盘点管理编辑 2026-01-27 10:24:01 +08:00
zhou-hongcheng 2afe2061af 移位管理移位数量赋值 2026-01-27 10:00:39 +08:00
zhou-hongcheng 18d479b55e 移位管理修改保存bug 2026-01-27 09:25:22 +08:00
zhou-hongcheng 0512713541 Merge branch 'dev_lzh_wms_20260120' into wms_dev 2026-01-26 17:25:00 +08:00
zhou-hongcheng 04a7dedbca 同步wms物料增加币制 2026-01-26 17:22:27 +08:00
zhou-hongcheng 1f8f89264b 同步wms物料规格型号 2026-01-26 16:51:16 +08:00
zhou-hongcheng 93a4afbacc 完成移位容器逻辑注释 2026-01-26 16:45:54 +08:00
zhou-hongcheng bc4e60a408 完成移位获取详情时sql错误 2026-01-26 14:17:29 +08:00
zhou-hongcheng 5b86965586 物料system同步wms内容 2026-01-26 11:41:28 +08:00
zhou-hongcheng b62a8eb7cf Merge branch 'dev_lzh_wms_20260120' into wms_dev 2026-01-26 11:18:14 +08:00
zhou-hongcheng 1fadbbdec5 物料wms模块回滚之前修改 2026-01-26 11:17:38 +08:00
zhou-hongcheng df671374b3 物料新增system模块 2026-01-26 09:50:54 +08:00
zhou-hongcheng 732bfa1f5a Merge branch 'dev_lzh_wms_20260120' into wms_dev 2026-01-24 17:20:53 +08:00
zhou-hongcheng 1997aa2e8d 物料修改 2026-01-24 16:19:44 +08:00
zhou-hongcheng 12a5cc6129 批次详情的子项修改实际为新增新的一条bug修复 2026-01-24 15:35:09 +08:00
zhou-hongcheng 5bde552f18 无聊详情回显库存预警 2026-01-24 13:13:43 +08:00
zhou-hongcheng 03860eb30a Merge branch 'dev_lzh_wms_20260120' into wms_dev 2026-01-24 11:37:49 +08:00
zhou-hongcheng 276138394e 去掉库区库位 2026-01-24 11:37:12 +08:00
zhou-hongcheng 3196c3416a Merge branch 'dev_lzh_wms_20260120' into wms_dev 2026-01-23 15:31:44 +08:00
zhou-hongcheng a51e6e3f3d 配置 2026-01-23 15:30:46 +08:00
zhou-hongcheng 6255279979 物料管理增加规格 2026-01-23 15:30:30 +08:00
zhou-hongcheng 7802b28143 新增货主后列表不展示bug修改 2026-01-23 15:30:01 +08:00
zhou-hongcheng 805740f78c 物料管理新增字段 2026-01-22 17:28:46 +08:00
zhou-hongcheng 55b6554216 物料管理批次bug和品牌idbug 2026-01-22 11:36:47 +08:00
zhou-hongcheng 9e8f0f195a 货主管理新增字段 补充备注 2026-01-21 16:54:26 +08:00
zhou-hongcheng f3f10d10db 租赁管理 2026-01-21 16:06:32 +08:00
zhou-hongcheng fe174b45ef 货主管理新增字段 2026-01-20 16:09:23 +08:00
zhou-hongcheng 2cf42f6e06 修改bug添加子项保存不上,和查询子项查询不到 2026-01-20 14:53:56 +08:00