weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
801 Commits 16 Branches 0 Tags
4649e53b78d04ca388909e93c8ae14a1560cf8bd
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zhou-hongcheng f3455d34eb WMS推送时费用类别和费用科目取租赁管理维护的值 2026-03-14 16:09:20 +08:00
zhou-hongcheng 7dac63da34 Merge remote-tracking branch 'origin/dev' into dev 2026-03-14 15:36:04 +08:00
zhou-hongcheng 22efdd5ac8 租赁去掉查询字典改为直接存值 2026-03-14 15:35:52 +08:00
zhou-hongcheng 24486e416f Merge remote-tracking branch 'origin/dev' into dev 2026-03-14 15:24:08 +08:00
zhou-hongcheng 809a190ccf 仓库出租率租赁散租面积处理 2026-03-14 15:23:56 +08:00
zhou-hongcheng 23ec38d4a3 Merge remote-tracking branch 'origin/dev' into dev 2026-03-14 14:20:44 +08:00
zhou-hongcheng c7a7afb5ce 库存调整记录状态编码 2026-03-14 14:20:30 +08:00
zhou-hongcheng 5eaa77e6eb 库存调整记录用户名字修改 2026-03-14 14:04:25 +08:00
zhou-hongcheng 7fac8be315 租赁增加费用科目、类别，天数 查询的时候从字典获取值 2026-03-14 13:51:53 +08:00
zhou-hongcheng fb2b24aa94 入库库存调整记录 2026-03-14 13:13:02 +08:00
zhou-hongcheng 4cd297acbc 合并条件增加批次号 2026-03-14 11:46:58 +08:00
zhou-hongcheng 540a47e3a8 合并条件增加批次号 2026-03-14 11:43:16 +08:00
zhou-hongcheng cf5ad7ca3f Merge remote-tracking branch 'origin/dev' into dev 2026-03-14 11:08:57 +08:00
zhou-hongcheng 1ece948a38 user服务配置 2026-03-14 11:08:45 +08:00
zhou-hongcheng 51a7501da6 Merge remote-tracking branch 'origin/dev' into dev 2026-03-14 09:02:52 +08:00
zhou-hongcheng ea7f4bca56 影响到其它地方了修改物料改为前端过滤 2026-03-14 09:02:39 +08:00
zhou-hongcheng f7fea55e23 即时库存收货数量筛选问题 2026-03-13 14:54:08 +08:00
zhou-hongcheng 3029e9fee1 Merge remote-tracking branch 'origin/dev' into dev 2026-03-13 13:31:57 +08:00
zhou-hongcheng 89db83dd05 调整后可用数量 盘亏 减差异数量 盘盈 加差异数量，调整后库存数量 用盘点数量 2026-03-13 13:31:45 +08:00
zhou-hongcheng 1d1adc61e8 Merge remote-tracking branch 'origin/dev' into dev 2026-03-13 11:10:24 +08:00
zhou-hongcheng b568bccf02 移位库存调整记录调整数量修改 2026-03-13 11:10:12 +08:00
zhou-hongcheng b90b27fd2c Merge remote-tracking branch 'origin/dev' into dev 2026-03-13 10:29:59 +08:00
zhou-hongcheng 4bd8005e1e 修改移位后生成的库存批次属性维护的值没保存上 2026-03-13 10:29:48 +08:00
zhou-hongcheng a4aeb1489a Merge remote-tracking branch 'origin/dev' into dev 2026-03-13 09:18:07 +08:00
zhou-hongcheng e3bc0b14fc 去掉联电话的校验 2026-03-13 09:17:55 +08:00
zhou-hongcheng 4ef1a02933 参数代理对象feign调用问题 2026-03-12 12:10:04 +08:00
zhou-hongcheng d0d5c4a15b 参数代理对象feign调用问题 2026-03-12 11:12:44 +08:00
zhou-hongcheng 18bdc2f931 Merge remote-tracking branch 'origin/dev' into dev 2026-03-12 10:15:30 +08:00
zhou-hongcheng ea29156a35 system配置文件改为测试地址 2026-03-12 10:15:16 +08:00
zhou-hongcheng 2c2a837ea8 新增物料远程调用对象转换问题 2026-03-12 10:01:43 +08:00
zhou-hongcheng c14f3f766b 新增物料远程调用问题 2026-03-12 09:02:17 +08:00
zhou-hongcheng b24e26c138 倒序 2026-03-11 17:14:00 +08:00
zhou-hongcheng 17e9f43494 差异管理盘点轮次 2026-03-11 17:06:45 +08:00
zhou-hongcheng 56dd366ec5 出库管理-自动分配物料当前库存容量不够时剩余分配计划分配到其它库位 2026-03-11 15:10:57 +08:00
zhou-hongcheng 5517951010 出库管理-自动分配物料当前库存容量不够时剩余分配计划分配到其它库位 2026-03-11 15:10:34 +08:00
zhou-hongcheng 5205b1aca2 差异过账调整前后净重... 2026-03-10 17:57:50 +08:00
zhou-hongcheng 92e1a09b50 Merge remote-tracking branch 'origin/dev' into dev 2026-03-10 17:44:56 +08:00
zhou-hongcheng 5fdf55ec6e 移位管理调整前后净重...重置id 2026-03-10 17:44:44 +08:00
zhou-hongcheng 5c4d962792 Merge remote-tracking branch 'origin/dev' into dev 2026-03-10 17:26:43 +08:00
zhou-hongcheng af7f980735 移位管理调整前后净重... 2026-03-10 17:26:28 +08:00
zhou-hongcheng 7067220f7f Merge remote-tracking branch 'origin/dev' into dev 2026-03-10 16:32:29 +08:00
zhou-hongcheng feb13e3ece 出库调整前后净重... 2026-03-10 16:32:18 +08:00
zhou-hongcheng e3e73a307c 费用科目编辑显示排序 2026-03-10 15:29:41 +08:00
zhou-hongcheng 106fbe9a90 Merge remote-tracking branch 'origin/dev' into dev 2026-03-10 14:29:33 +08:00
zhou-hongcheng 80353a9699 出库单增加计划出库分配拣货复合数量 2026-03-10 14:29:20 +08:00
zhou-hongcheng 906c65c164 上架管理全部上架生成库存调整记录修改 2026-03-10 10:35:40 +08:00
zhou-hongcheng 0924e1466b 新增无聊条码保存不上bug修改 2026-03-10 09:58:51 +08:00
zhou-hongcheng 6e52d85cbf 出库交接增加净重... 2026-03-09 16:32:02 +08:00
zhou-hongcheng c85adcf878 出库管理手动自动分配增加净重... 2026-03-09 15:31:48 +08:00
zhou-hongcheng a0c250cce8 上架管理全部上架生成库存调整记录 2026-03-09 15:05:16 +08:00
zhou-hongcheng d7ebb21f3b 库存调整记录查询 2026-03-09 14:30:59 +08:00
zhou-hongcheng b210c08863 库存调整记录增加字段 2026-03-09 11:28:03 +08:00
zhou-hongcheng d991861d03 差异过账生成库存调整记录增加参数净重... 2026-03-09 10:52:40 +08:00
zhou-hongcheng d87de81d82 Merge remote-tracking branch 'origin/dev' into dev 2026-03-09 09:33:51 +08:00
zhou-hongcheng 6d17c91500 过滤包装规格 name等于空的值 2026-03-09 09:33:17 +08:00
zhou-hongcheng 4371be3999 sql纠错 2026-03-06 09:06:11 +08:00
zhou-hongcheng 6dfb747120 Merge remote-tracking branch 'origin/dev' into dev 2026-03-05 17:24:11 +08:00
zhou-hongcheng 750fdbe96f 差异管理添加状态待过账、重盘、已过账； 2026-03-05 16:48:24 +08:00
zhou-hongcheng 5ae7149ea5 差异过账生成库存调整记录 2026-03-05 16:19:34 +08:00
zhou-hongcheng e7e5fb0101 计费单据以为定时任务修改了TopOrganizationId不从当前登录人获取 现在新增的时候有改成传值 2026-03-05 10:38:43 +08:00
zhou-hongcheng df04d5d36d 同步增加客户类型编码 2026-03-04 15:11:16 +08:00
zhou-hongcheng 44982e97c6 Merge remote-tracking branch 'origin/dev' into dev 2026-03-03 16:30:32 +08:00
zhou-hongcheng 02c8e16242 净重、毛重、体积、面积，原库位未减移出数量，目标库位按照移入数量保存 2026-03-03 16:30:19 +08:00
zhou-hongcheng 7929d25e10 Merge remote-tracking branch 'origin/dev' into dev 2026-03-03 13:59:41 +08:00
zhou-hongcheng 2a7091a63e 补全缺少的批次和货主编码 2026-03-03 13:59:31 +08:00
zhou-hongcheng 28932f1756 Merge remote-tracking branch 'origin/dev' into dev 2026-03-03 11:20:44 +08:00
zhou-hongcheng a44bc6e40d 增加查询条件 2026-03-03 11:20:32 +08:00
zhou-hongcheng 744385db91 Merge remote-tracking branch 'origin/dev' into dev 2026-03-02 11:02:26 +08:00
zhou-hongcheng a9d8e2528f 合同管理sql条件判断空字符 2026-03-02 11:02:14 +08:00
zhou-hongcheng 2ad2f9d0ab 处理空指针异常 2026-03-02 09:58:54 +08:00
zhou-hongcheng e1dfb71da4 Merge remote-tracking branch 'origin/dev' into dev 2026-03-02 09:10:37 +08:00
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