曹鹏飞
|
08066941c8
|
feat: 一些优化
|
2025-11-25 13:53:40 +08:00 |
|
曹鹏飞
|
376f3c5323
|
fix: bug-928 成品订单入库（生产订单入库）清点件，入库后WMS库存没增加
|
2025-11-25 11:49:56 +08:00 |
|
曹鹏飞
|
268fbc3220
|
feat: 一些优化
|
2025-11-18 10:37:13 +08:00 |
|
曹鹏飞
|
172ddbc444
|
feat: 一些优化
|
2025-11-17 14:04:50 +08:00 |
|
曹鹏飞
|
7309136378
|
feat: 一些优化
|
2025-11-16 16:13:27 +08:00 |
|
曹鹏飞
|
fd7dea2786
|
出库添加齐套逻辑
|
2025-11-14 18:25:12 +08:00 |
|
曹鹏飞
|
136b14a74a
|
Merge branch 'feature/bug-883' into develop
|
2025-11-13 18:17:18 +08:00 |
|
曹鹏飞
|
6d3c1b388b
|
生产订单入库过账时，如果是清点件，则使用主物料信息过账
|
2025-11-13 18:17:07 +08:00 |
|
曹鹏飞
|
d48defea66
|
feat:处理合并问题
|
2025-11-13 17:42:17 +08:00 |
|
曹鹏飞
|
2f794b9972
|
feat:处理合并问题
|
2025-11-13 17:37:20 +08:00 |
|
曹鹏飞
|
54fd717f83
|
Merge branch 'feature/bug-883' into develop
# Conflicts:
# nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java
# nflg-wms-starter/src/main/java/com/nflg/wms/starter/BaseController.java
|
2025-11-13 17:31:23 +08:00 |
|
曹鹏飞
|
e9da850ec3
|
feat: bug-883 出库业务先进先出控制，推荐批次，异常业务审批功能
|
2025-11-13 17:25:42 +08:00 |
|
曹鹏飞
|
88717846a8
|
Merge branch 'feature/bug-890' into develop
# Conflicts:
# nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java
# nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/OutProduceSearchQO.java
# nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutProduceTicketVO.java
# nflg-wms-repository/src/main/resources/mapper/WmsOutProduceTicketMapper.xml
|
2025-11-12 14:48:06 +08:00 |
|
曹鹏飞
|
9e2b8d678c
|
Merge branch 'feature/bug-884' into develop
# Conflicts:
# nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/InMaterialScanRecord.java
# nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryServiceImpl.java
# nflg-wms-starter/src/main/java/com/nflg/wms/starter/BaseController.java
|
2025-11-12 14:36:13 +08:00 |
|
曹鹏飞
|
75851272d3
|
Merge branch 'feature/bug-883' into develop
|
2025-11-12 14:33:17 +08:00 |
|
曹鹏飞
|
819de47012
|
Merge branch 'sit' into develop
|
2025-11-12 14:31:51 +08:00 |
|
曹鹏飞
|
4b228fa369
|
feat: bug-884 添加【副产品(拆解)入库】业务
|
2025-11-12 14:29:31 +08:00 |
|
曹鹏飞
|
59b2a4b92f
|
feat: bug-883 出库业务先进先出控制，推荐批次，异常业务审批功能
|
2025-11-12 14:06:51 +08:00 |
|
曹鹏飞
|
578151527a
|
feat: bug-884 添加【副产品(拆解)入库】业务
|
2025-11-12 10:48:56 +08:00 |
|
曹鹏飞
|
cca3b41182
|
feat: bug-883 出库业务先进先出控制，推荐批次，异常业务审批功能
|
2025-11-11 17:50:10 +08:00 |
|
曹鹏飞
|
a693a94d58
|
feat: bug-884 添加【副产品(拆解)入库】业务
|
2025-11-11 17:45:46 +08:00 |
|
曹鹏飞
|
3b6d708fc1
|
feat: bug-890 成品出入库相关业务单据拆分
|
2025-11-11 13:48:17 +08:00 |
|
曹鹏飞
|
af32692f93
|
feat: bug-883 出库业务先进先出控制，推荐批次，异常业务审批功能
|
2025-11-11 09:43:19 +08:00 |
|
曹鹏飞
|
6785e797a5
|
feat: bug-762 钢构件订单创建部分字段信息自动带出上一次的值
|
2025-11-10 10:23:36 +08:00 |
|
曹鹏飞
|
f796618f14
|
feat: 修复钢构件送货单excel在低版本wps中无法显示二维码的问题
|
2025-11-04 17:22:59 +08:00 |
|
曹鹏飞
|
5884572ac6
|
feat: 修复钢构件送货单excel在低版本wps中无法显示二维码的问题
|
2025-11-04 17:22:26 +08:00 |
|
曹鹏飞
|
6c060fbc17
|
Merge remote-tracking branch '惠信/dev_zhangke' into develop
|
2025-10-27 11:16:25 +08:00 |
|
曹鹏飞
|
d38aa6433a
|
feat: bug-862 工厂间转储入库时PDA不校验【转入储位】必填
|
2025-10-27 11:14:56 +08:00 |
zhangke
|
85f1f17402
|
Merge branch 'develop' into dev_zhangke
|
2025-10-27 11:14:27 +08:00 |
|
zhangke
|
d238c8b7e2
|
零部件打包编辑的时候添加修改送货人和送货地址的内容
|
2025-10-27 11:14:11 +08:00 |
|
曹鹏飞
|
7e43292c8e
|
Merge branch 'develop' into sit
|
2025-10-24 18:03:29 +08:00 |
|
曹鹏飞
|
7de3bd095b
|
feat: bug-861 部分接口未使用自定义数量而是使用二维码中的数量
|
2025-10-24 18:02:40 +08:00 |
|
曹鹏飞
|
0233a1f387
|
feat: 一些优化
|
2025-10-22 10:11:53 +08:00 |
|
曹鹏飞
|
1e2e8cdb88
|
feat: 图纸导入调整，如果导入的是图片，则每次都新增版本，如果是excel则逻辑不变
|
2025-10-22 09:24:23 +08:00 |
|
曹鹏飞
|
a5ab1f9538
|
feat: 一些优化
|
2025-10-21 18:10:22 +08:00 |
|
曹鹏飞
|
118a14831d
|
feat: 一些优化
|
2025-10-21 17:51:44 +08:00 |
|
曹鹏飞
|
41275bcb64
|
feat: 一些优化
|
2025-10-21 11:26:08 +08:00 |
|
zhangke
|
d0d74ef354
|
Merge branch 'develop' into dev_zhangke
|
2025-10-21 09:46:25 +08:00 |
|
zhangke
|
439b980514
|
修改了库存物料打印的问题
|
2025-10-21 09:21:50 +08:00 |
|
曹鹏飞
|
f85d51810e
|
Merge branch 'refs/heads/feature/bug-789' into develop
|
2025-10-20 14:43:12 +08:00 |
|
zhangke
|
cf595cc056
|
处理zwm3A17接口 序列号为null的问题
|
2025-10-20 10:40:55 +08:00 |
|
曹鹏飞
|
6a074de6f9
|
feat: bug-838 工艺室提出的问题
|
2025-10-17 17:45:21 +08:00 |
|
曹鹏飞
|
8600f90dcd
|
feat: 一些优化
|
2025-10-13 14:31:51 +08:00 |
|
曹鹏飞
|
5548591b84
|
feat: 一些优化
|
2025-10-13 09:56:17 +08:00 |
 zhangke
|
bc39437a8b
|
Revert "Add .gitignore to exclude all jar files except lib dependencies"
This reverts commit ff0b7ff323.
|
2025-10-11 23:27:56 +08:00 |
|
zhangke
|
7bf728f811
|
Revert "Update .gitignore to exclude D:/develop/soft directory"
This reverts commit 6a7eb68240.
|
2025-10-11 23:27:56 +08:00 |
|
zhangke
|
6a14d8cd20
|
Revert "Update .gitignore for Mac environment: replace Windows Maven repository paths with Mac paths"
This reverts commit 21050326
|
2025-10-11 23:27:56 +08:00 |
|
zhangke
|
d0dff7f7e3
|
Revert "Add .gitignore to exclude all jar files except lib dependencies"
This reverts commit ff0b7ff3
|
2025-10-11 23:27:38 +08:00 |
|
zhangke
|
7761a841c7
|
Merge remote-tracking branch 'origin/dev_zhangke' into dev_zhangke
|
2025-10-11 23:25:28 +08:00 |
|
zhangke
|
210503269d
|
Update .gitignore for Mac environment: replace Windows Maven repository paths with Mac paths
|
2025-10-11 23:17:54 +08:00 |