曹鹏飞
|
cc97b57f97
|
feat: bug-965 副产品入库单名称修改
|
2025-12-01 13:54:59 +08:00 |
|
曹鹏飞
|
f4e7abcf2b
|
feat: bug-966 返回字段添加批次号，数据为yyMMdd+4位流水号
|
2025-12-01 11:42:18 +08:00 |
|
曹鹏飞
|
101501516c
|
refactor(scan): 修改序列号字段名为serialNumbers并更新相关逻辑
- 将ScanCodeQO中serialNumber字段重命名为serialNumbers
- 更新ComponentOutboundController中序列号相关判断和赋值逻辑
- 修正InCostCenterBackController和OutCostCenterController中序列号字段映射
- 修改SapService中生成映射时使用serialNumbers字段
- 确保确认PDA方法参数格式统一调整
- 保持所有涉及序列号比较和处理的代码一致使用serialNumbers字段名
|
2025-12-01 11:24:28 +08:00 |
|
曹鹏飞
|
188043c6b5
|
fix: 修复生产订单入库单位未设置导致提交SAP报错的问题
|
2025-11-28 15:57:46 +08:00 |
|
曹鹏飞
|
10b37eda16
|
feat: bug-935 钢结构订单缺件功能优化
|
2025-11-28 15:25:46 +08:00 |
|
曹鹏飞
|
6e0f207e1e
|
feat: bug-937 钢构包送货单打印模板中的备注字段取消取值
|
2025-11-25 15:51:57 +08:00 |
|
曹鹏飞
|
5ad04bd10e
|
feat: bug-841 钢结构订单批量导入功能及非采购订单关联的订单
|
2025-11-25 15:49:38 +08:00 |
|
曹鹏飞
|
4b5f2d1864
|
Merge branch 'feature/bug-841' into develop
|
2025-11-25 15:17:44 +08:00 |
|
曹鹏飞
|
efdccae817
|
feat: bug-841 钢结构订单批量导入功能及非采购订单关联的订单
|
2025-11-25 15:17:23 +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 |
|
曹鹏飞
|
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 |
|
曹鹏飞
|
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 |
|
曹鹏飞
|
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 |
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 |
|
曹鹏飞
|
7de3bd095b
|
feat: bug-861 部分接口未使用自定义数量而是使用二维码中的数量
|
2025-10-24 18:02:40 +08:00 |
|
曹鹏飞
|
1e2e8cdb88
|
feat: 图纸导入调整，如果导入的是图片，则每次都新增版本，如果是excel则逻辑不变
|
2025-10-22 09:24:23 +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
|
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
|
7b0734bb32
|
Merge branch 'develop' into dev_zhangke
|
2025-10-11 22:57:58 +08:00 |
|
zhangke
|
b606368669
|
1、零部件装车单和零部件出库单添加了冲销的功能
|
2025-10-11 22:57:41 +08:00 |
|
曹鹏飞
|
534451400f
|
Merge branch 'feature/bug-776' into develop
|
2025-10-11 18:06:19 +08:00 |
|
曹鹏飞
|
9b4e5d62f4
|
feat: bug-776 所有的出库操作扫码后流程需要调整
|
2025-10-11 18:06:10 +08:00 |
|
曹鹏飞
|
dee8259e81
|
feat: 一些优化
|
2025-10-11 17:36:42 +08:00 |
|
曹鹏飞
|
9be20e6a35
|
feat: 一些优化
|
2025-10-11 16:40:33 +08:00 |
|
曹鹏飞
|
df06e278f1
|
feat: bug-817 采购退库查询SAP的结果的工厂字段调整到表头
|
2025-10-11 16:26:52 +08:00 |
|
曹鹏飞
|
a194ebc294
|
feat: bug-817 采购退库查询SAP的结果的工厂字段调整到表头
|
2025-10-11 16:25:58 +08:00 |
|
曹鹏飞
|
0b9d3923b0
|
Merge branch 'feature/bug-815' into develop
|
2025-10-11 14:58:18 +08:00 |
|
曹鹏飞
|
f45a3f4ba1
|
feat: bug-815 厂内调拨单和工厂间调拨单功能调整
|
2025-10-11 14:58:04 +08:00 |
|
曹鹏飞
|
6789b81523
|
Merge branch 'feature/bug-813' into develop
|
2025-10-11 11:46:05 +08:00 |
|
曹鹏飞
|
99176cdca2
|
feat: bug-813 零部件打包详情查询接口返回工厂编号
|
2025-10-11 11:45:48 +08:00 |
|
曹鹏飞
|
c36fa6590d
|
Merge branch 'feature/bug-813' into develop
|
2025-10-11 11:20:22 +08:00 |
|
曹鹏飞
|
8a4e2de9d2
|
feat: bug-813 pda所有详情查询接口返回工厂编号
|
2025-10-11 11:20:06 +08:00 |
|
曹鹏飞
|
7dfa50c084
|
feat: bug-813 零部件打包详情查询接口返回工厂编号
|
2025-10-11 11:01:53 +08:00 |
|
曹鹏飞
|
309ec6bdba
|
feat: bug-802 生产补料单取消申请数量不能大于需求量的校验
|
2025-10-11 10:08:28 +08:00 |
|
曹鹏飞
|
d4121b1e6d
|
Merge branch 'feature/bug-764' into develop
# Conflicts:
# nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java
|
2025-10-10 17:07:49 +08:00 |
|
曹鹏飞
|
0b399d3ef6
|
feat: bug-764 扫码记录的时间格式化
|
2025-10-10 17:06:08 +08:00 |
|
曹鹏飞
|
555b4792ba
|
feat: bug-789 成本中心领料(退料）单据新增,搜索条件添加【单号】
|
2025-10-10 14:19:14 +08:00 |
|
曹鹏飞
|
6226770de9
|
Merge branch 'feature/bug-788' into develop
|
2025-10-10 10:14:27 +08:00 |
|
曹鹏飞
|
3fa3afdbd4
|
Merge branch 'feature/bug-784' into develop
|
2025-10-10 10:14:16 +08:00 |
|
曹鹏飞
|
40d8de59b6
|
feat: bug-784 钢构包订单添加缺件交货的功能
|
2025-10-10 10:14:04 +08:00 |
|
曹鹏飞
|
314a5303a5
|
feat: bug-788 库存物料条码打印问题修改
|
2025-10-10 10:13:15 +08:00 |
|
曹鹏飞
|
f877f48f9d
|
Merge branch 'feature/bug-788' into develop
|
2025-10-10 09:40:26 +08:00 |
|
曹鹏飞
|
f5a0983aa5
|
feat: 入库记录添加工厂、仓位、储位数据
|
2025-10-09 17:59:56 +08:00 |
|
曹鹏飞
|
02e02977fa
|
feat: bug-788 库存物料条码打印问题修改
|
2025-10-09 16:01:37 +08:00 |
|
曹鹏飞
|
88a71210e1
|
fix: 修复成本中心领料出库时库存查询的仓库未设置为请求参数的仓库信息的问题
|
2025-10-09 15:10:50 +08:00 |
|
曹鹏飞
|
ab9af970ea
|
fix: 修复成本中心领料出库时库存查询的仓库未设置为请求参数的仓库信息的问题
|
2025-10-09 15:06:56 +08:00 |
|
曹鹏飞
|
f86b8b0f7f
|
Merge branch 'feature/bug-787' into develop
# Conflicts:
# nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java
|
2025-10-09 13:54:58 +08:00 |
|
曹鹏飞
|
b1bdf8cbb8
|
feat: bug-787 生成物料二维码缺少供应商字段导致数据错误
|
2025-10-09 13:51:04 +08:00 |
|
曹鹏飞
|
6f064ce6e0
|
Merge branch 'feature/bug-776' into develop
|
2025-10-09 11:58:19 +08:00 |
|
曹鹏飞
|
119e867890
|
feat: bug-776 所有的出库操作扫码后流程需要调整
|
2025-10-09 11:57:55 +08:00 |
|
曹鹏飞
|
f88e725683
|
Merge branch 'feature/bug-776' into develop
|
2025-10-08 11:19:00 +08:00 |
|
曹鹏飞
|
c3159f91fa
|
Merge remote-tracking branch '惠信/dev_zhangke' into develop
|
2025-10-08 11:16:03 +08:00 |
|
曹鹏飞
|
f008989a1c
|
Merge branch 'feature/bug-784' into develop
|
2025-10-08 11:15:38 +08:00 |
|
曹鹏飞
|
6a02cb9270
|
feat: bug-784 钢构包订单添加缺件交货的功能
|
2025-10-08 11:13:20 +08:00 |
|
曹鹏飞
|
be2af35025
|
feat: bug-783 采购单退库功能调整
|
2025-10-08 09:12:33 +08:00 |
|
zhangke
|
270b2d110b
|
Merge branch 'rakor' into dev_zhangke
|
2025-10-05 13:06:29 +08:00 |
|
曹鹏飞
|
04b68647b3
|
feat: bug-779 生产订单入库需要可多个生产订单合并打印
|
2025-10-01 08:49:10 +08:00 |
|
zhangke
|
fc3e06863a
|
1、添加库存物料打印的功能；
2、修改生成订单PDA确认商家的时候，仓储为null 时报错的问题
|
2025-09-30 17:00:12 +08:00 |
|
zhangke
|
e326e5ac14
|
Merge remote-tracking branch 'refs/remotes/origin/rakor' into dev_zhangke
|
2025-09-30 11:07:28 +08:00 |
|
zhangke
|
afb0b214a9
|
修改了零部件出口的 二维码不验证唯一性的问题
修改批量无码上架的问题
|
2025-09-30 09:36:49 +08:00 |
|
曹鹏飞
|
19674ba135
|
feat: bug-776 所有的出库操作扫码后流程需要调整
|
2025-09-29 18:02:12 +08:00 |
|
曹鹏飞
|
924bf4c5ff
|
采购退库优化：
1、PDA提交数据校验优化；
2、PC页面搜索列表添加供应商名称字段
|
2025-09-29 10:27:49 +08:00 |
|
曹鹏飞
|
a42df50cd8
|
一些优化
|
2025-09-28 16:47:40 +08:00 |
|
曹鹏飞
|
508576debb
|
feat: bug-765 整单打印的二维码没有号码后的流水码
|
2025-09-28 13:51:52 +08:00 |
|
曹鹏飞
|
13889b2703
|
feat: bug-774 打印模板中的公司名称全部更改为【福建南方路面机械股份有限公司】
|
2025-09-28 13:50:55 +08:00 |
|
曹鹏飞
|
c8722c267a
|
一些优化
|
2025-09-26 18:04:00 +08:00 |
|
曹鹏飞
|
5d8f839272
|
Merge remote-tracking branch '惠信/dev_zhangke' into rakor
|
2025-09-26 12:01:19 +08:00 |
|
曹鹏飞
|
44d06ad46d
|
feat: bug-751 老鼠图-PDF导出样式的问题
|
2025-09-26 10:42:55 +08:00 |
|
zhangke
|
c5ecfd8409
|
1、更改图纸上传图片的版本逻辑
|
2025-09-26 10:23:17 +08:00 |
|
曹鹏飞
|
4c1d36e6ba
|
Merge remote-tracking branch '惠信/dev_zhangke' into rakor
|
2025-09-26 09:57:24 +08:00 |
|
曹鹏飞
|
a363a5b610
|
feat: bug-755 生成送货单时选了所有托盘仍然提示数据未齐套
|
2025-09-26 09:56:21 +08:00 |
|
zhangke
|
59948a87da
|
Merge remote-tracking branch 'origin/rakor' into dev_zhangke
|
2025-09-26 08:05:43 +08:00 |
|
曹鹏飞
|
05b9005120
|
feat: 将pdf使用的字体外挂，减少打包的jar体积
|
2025-09-25 17:55:33 +08:00 |
|
zhangke
|
ce8e6a3494
|
1、无码收货的查询添加批次号的判断
|
2025-09-25 16:18:25 +08:00 |
|
zhangke
|
038b61449b
|
1、条码添加一个入库单的ID号
2、测试普通物料非质检的无码收货、上架流程
|
2025-09-25 16:05:44 +08:00 |
|
zhangke
|
9eeb24819c
|
无码收货搜索条件
|
2025-09-25 11:52:15 +08:00 |
|
曹鹏飞
|
67623100b0
|
feat: 添加actuator支持
|
2025-09-25 11:49:59 +08:00 |
|
zhangke
|
c1e82f45ed
|
1、修改供应商导出和导入功能
2、修改无码收货查询的接口，添加一个根据单据编号搜索的字段
|
2025-09-25 11:21:29 +08:00 |
|
曹鹏飞
|
d989bbc299
|
feat: bug-200 整张打印添加行：批次号
|
2025-09-25 10:48:28 +08:00 |
|
曹鹏飞
|
11b4dd11b4
|
feat: bug-721 钢构件版本号支持字母+数字
|
2025-09-25 10:21:02 +08:00 |
|
zhangke
|
7d1a3750ef
|
1、修改供應商沒有開通權限的時候，刪除報錯的問題
2、修改刪除用戶的 接口方式
|
2025-09-25 09:20:36 +08:00 |
|
曹鹏飞
|
d210cd94c5
|
一些优化
|
2025-09-24 16:56:47 +08:00 |
|
zhangke
|
03e2d272d8
|
Merge branch 'rakor' into dev_zhangke
|
2025-09-23 21:32:01 +08:00 |
|
曹鹏飞
|
d4cb53d482
|
feat(material): 新增批量获取物料信息接口
|
2025-09-23 19:58:54 +08:00 |
|
zhangke
|
45d678f980
|
修改了钢构包和普通物料打印条码时查询和存储的供应商编号为Id
|
2025-09-23 16:37:07 +08:00 |
|
zhangke
|
a37736494a
|
Merge branch 'rakor' into dev_zhangke
|
2025-09-23 15:57:06 +08:00 |
|
曹鹏飞
|
1dac30c1d5
|
一些优化
|
2025-09-23 15:50:24 +08:00 |
|
曹鹏飞
|
20684c7acd
|
Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into rakor
|
2025-09-23 12:05:29 +08:00 |
|
zhangke
|
799ac02088
|
修改了钢构包和普通物料打印条码时查询和存储的供应商编号为Id
|
2025-09-23 11:27:40 +08:00 |
|
曹鹏飞
|
c5d2811c97
|
Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into rakor
|
2025-09-23 08:01:52 +08:00 |
|
zhangke
|
5f0f40404c
|
1、修改了供应商的代码
|
2025-09-22 20:16:44 +08:00 |
|
曹鹏飞
|
93a8819d8d
|
一些优化
|
2025-09-22 17:47:51 +08:00 |
|
zhangke
|
397c3b4581
|
1、修改了供应商的代码
|
2025-09-22 16:15:40 +08:00 |
|
zhangke
|
9d327f9ed1
|
新增无码收货和无码上架的功能
|
2025-09-21 23:06:27 +08:00 |
|
zhangke
|
fc54a528e8
|
1、添加无码收货的，功改了一半
|
2025-09-21 18:13:39 +08:00 |
|
zhangke
|
d8f4368d20
|
1、添加无码收货的，功改了一半
|
2025-09-19 21:25:14 +08:00 |
|
zhangke
|
8eb712741f
|
1、添加无码收货的，功改了一半
|
2025-09-19 21:23:19 +08:00 |
|
曹鹏飞
|
c4dab5bf7f
|
一些优化
|
2025-09-19 17:01:06 +08:00 |
|
曹鹏飞
|
8500640600
|
Merge remote-tracking branch '惠信/dev_zhangke' into develop
# Conflicts:
# nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/UserControllerService.java
|
2025-09-19 09:11:19 +08:00 |
|
曹鹏飞
|
ef07d3160b
|
一些优化
|
2025-09-19 09:05:02 +08:00 |
|
zhangke
|
1df1506c4c
|
1、供应商相关逻辑优化修改
|
2025-09-19 08:55:38 +08:00 |
|
zhangke
|
82119dfc43
|
Merge branch 'develop' into dev_zhangke
|
2025-09-16 16:22:14 +08:00 |
|
zhangke
|
ee93e1b92a
|
1、零部件出库单搜索SAP结果
|
2025-09-16 16:21:48 +08:00 |
|
曹鹏飞
|
ac075c26b3
|
一些优化
|
2025-09-12 18:03:23 +08:00 |
|
曹鹏飞
|
2983c19b95
|
一些优化
|
2025-09-11 18:19:07 +08:00 |
|
zhangke
|
7a8f07ef76
|
1、零部件出库单测试完毕
|
2025-09-11 11:43:56 +08:00 |
|
zhangke
|
afa1e756d4
|
1、零部件出库单测试完毕
|
2025-09-11 08:54:42 +08:00 |
|
zhangke
|
c6f40c86a9
|
Merge branch 'develop' into dev_zhangke
|
2025-09-10 21:43:04 +08:00 |
|
zhangke
|
354677520f
|
1、零部件出库单测试完毕
|
2025-09-10 21:37:58 +08:00 |
|
曹鹏飞
|
272555b84c
|
一些优化
|
2025-09-10 18:09:31 +08:00 |
|
zhangke
|
b2babc691d
|
1、零部件出库的装车单开发测试完毕，出库单待测
|
2025-09-10 12:10:24 +08:00 |
|
zhangke
|
8e0458d944
|
Merge branch 'develop' into dev_zhangke
# Conflicts:
# nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java
|
2025-09-09 22:41:24 +08:00 |
|
zhangke
|
90abcd3054
|
完成零部件出库单的接口，zwm3a19的接口存在问题需要重新处理，少了一个删除装箱单的接口
|
2025-09-09 22:40:38 +08:00 |
|
曹鹏飞
|
331970b9b9
|
一些优化
|
2025-09-09 18:09:21 +08:00 |
|
zhangke
|
bc341d2fba
|
1、零部件出库的临时版本，无合并
|
2025-09-09 17:19:06 +08:00 |
|
zhangke
|
73dc55cc4a
|
Merge branch 'develop' into dev_zhangke
|
2025-09-08 21:42:21 +08:00 |
|
zhangke
|
7eb12b08fa
|
1、添加零部件出库单的表单信息和SAP的接口信息
|
2025-09-08 21:41:56 +08:00 |
|
曹鹏飞
|
5751392131
|
一些优化
|
2025-09-08 18:32:45 +08:00 |
|
zhangke
|
d40773b593
|
接收质检物料的接口调整
|
2025-09-08 11:51:34 +08:00 |
|
zhangke
|
98640065fe
|
Merge remote-tracking branch 'origin/develop' into dev_zhangke
|
2025-09-08 10:32:33 +08:00 |
|
曹鹏飞
|
f3bc54aa94
|
一些优化
|
2025-09-07 16:43:17 +08:00 |
|
zhangke
|
e97a81a2df
|
接收质检物料的接口调整
|
2025-09-05 21:42:52 +08:00 |
|
曹鹏飞
|
43454304dd
|
一些优化
|
2025-09-05 18:57:17 +08:00 |
|
zhangke
|
9e01b73fca
|
质检物料入库
|
2025-09-05 15:53:13 +08:00 |
|
zhangke
|
382cee9ca1
|
采购物料入库的调试
|
2025-09-05 14:41:31 +08:00 |
|
zhangke
|
e6334ee3a9
|
Merge branch 'develop' into dev_zhangke
|
2025-09-05 14:37:02 +08:00 |
|
zhangke
|
be24ba7bc8
|
采购物料入库的调试
|
2025-09-05 14:36:34 +08:00 |
|
曹鹏飞
|
e7c1d61009
|
一些优化
|
2025-09-04 20:09:52 +08:00 |
|
曹鹏飞
|
893717bfe2
|
Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into develop
|
2025-09-04 08:52:16 +08:00 |
|
曹鹏飞
|
d50e0738cf
|
一些优化
|
2025-09-03 18:44:23 +08:00 |
|
zhangke
|
1080638f20
|
修改质检物料收货的条码逻辑，更改了user的vo
|
2025-09-03 17:01:54 +08:00 |
|
zhangke
|
df144e410c
|
Merge branch 'develop' into dev_zhangke
|
2025-09-03 14:32:38 +08:00 |
|
曹鹏飞
|
c7d2e64583
|
一些优化
|
2025-09-03 14:31:52 +08:00 |
|
zhangke
|
ecfe26d708
|
优化了获取角色权限的方法
|
2025-09-03 12:33:36 +08:00 |
|
zhangke
|
9eb7ffbe02
|
测试了系统和平台模块，修改了bug
|
2025-09-03 10:16:53 +08:00 |
|
曹鹏飞
|
7e9dc3e702
|
一些优化
|
2025-09-02 18:25:14 +08:00 |
|
曹鹏飞
|
d350079342
|
一些优化
|
2025-09-02 09:24:11 +08:00 |
|
zhangke
|
70a1d57c55
|
修改了pda查找任务不需要ordeNo 必填
|
2025-09-01 09:32:14 +08:00 |
|
曹鹏飞
|
133d42deb0
|
一些优化
|
2025-08-31 21:03:30 +08:00 |
|
曹鹏飞
|
f41ecedea5
|
Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into develop
|
2025-08-29 09:34:53 +08:00 |
|
zhangke
|
2aa1c723c3
|
修改参数的备注信息
|
2025-08-28 18:24:57 +08:00 |
|
曹鹏飞
|
f5fc5c2368
|
一些优化
|
2025-08-28 18:07:31 +08:00 |
|
zhangke
|
cb53b606bb
|
一个临时的版本，用于前后端联调，屏蔽SAP部分功能
|
2025-08-27 22:38:10 +08:00 |
|
zhangke
|
56e5db2c3b
|
Merge branch 'develop' into dev_zhangke
|
2025-08-27 21:35:42 +08:00 |
|
曹鹏飞
|
55bdb3c95a
|
一些优化
|
2025-08-27 18:35:18 +08:00 |
|
曹鹏飞
|
95c7809730
|
一些优化
|
2025-08-26 18:14:19 +08:00 |
|
zhangke
|
018ecd60a2
|
修改普通送货单的接口的描述和配置文件
|
2025-08-26 11:23:57 +08:00 |
|
zhangke
|
21fb7417f6
|
Merge branch 'develop' into dev_zhangke
|
2025-08-26 11:15:14 +08:00 |
|
zhangke
|
8c9ebde6d3
|
修改了质检物料的相关接口
|
2025-08-26 09:03:32 +08:00 |
|
曹鹏飞
|
722bd067fc
|
Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into develop
|
2025-08-25 18:02:17 +08:00 |
|
zhangke
|
265fd6c54f
|
接口调试
|
2025-08-25 17:56:31 +08:00 |
|
曹鹏飞
|
69adc3fb18
|
Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into develop
|
2025-08-25 17:54:39 +08:00 |
|
曹鹏飞
|
f52f34eb66
|
添加功能
|
2025-08-25 17:47:54 +08:00 |
|
zhangke
|
e40cbf20e3
|
Merge branch 'develop' into dev_zhangke
|
2025-08-25 09:02:13 +08:00 |
|
zhangke
|
08177a1f1f
|
提交质检物料的上架确认和质检物料采购入库单、普通物料采购入库单
|
2025-08-24 11:18:30 +08:00 |
|
zhangke
|
63958f910b
|
代码合并并修改 3a17 的函数接口
|
2025-08-22 18:52:02 +08:00 |
|
曹鹏飞
|
07c1d0ec8c
|
添加功能
|
2025-08-22 18:52:00 +08:00 |
|
zhangke
|
94fb0d216d
|
Merge branch 'develop' into dev_zhangke
# Conflicts:
# nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java
# nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java
# nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java
# nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java
# nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/SRMController.java
|
2025-08-22 18:46:34 +08:00 |
|
zhangke
|
e64b2deeb0
|
完成采购单入库（普通物料）管理
|
2025-08-22 18:24:08 +08:00 |
|
曹鹏飞
|
8ac577a1f2
|
添加功能
|
2025-08-21 18:08:11 +08:00 |
|
曹鹏飞
|
6765075cbb
|
添加功能
|
2025-08-20 18:16:59 +08:00 |
|
曹鹏飞
|
00b9e7426d
|
添加功能
|
2025-08-19 18:22:15 +08:00 |
|
曹鹏飞
|
1f702bbd9d
|
优化测试
|
2025-08-19 08:49:21 +08:00 |
|
zhangke
|
d77c8669a1
|
暂存版本
|
2025-08-18 18:15:20 +08:00 |
|
曹鹏飞
|
2e0df1c816
|
添加功能
|
2025-08-17 15:35:37 +08:00 |
|
曹鹏飞
|
c9ed597c86
|
Merge remote-tracking branch '惠信/dev_zhangke' into develop
|
2025-08-17 15:21:35 +08:00 |
|
zhangke
|
0430e35af3
|
修改SAP接口 ZWM00_MB113（厂内调库过账的接口）的函数名称
|
2025-08-17 15:19:24 +08:00 |
|
曹鹏飞
|
1ee072e15f
|
Merge remote-tracking branch '惠信/dev_zhangke' into develop
|
2025-08-17 15:12:44 +08:00 |
|
曹鹏飞
|
3b6673789e
|
添加功能
|
2025-08-17 15:11:56 +08:00 |
|
zhangke
|
ea1ba6bd5b
|
添加SAP接口ZWM3A21【获取物料的属性信息（仓库、库位、批次管理、序号管理，是否质检）】
添加 SAP接口 ZWM00_MB113（厂内调库过账的接口）
|
2025-08-16 18:37:25 +08:00 |
|
zhangke
|
7c2734ff19
|
Merge branch 'develop' into dev_zhangke
|
2025-08-15 13:54:25 +08:00 |
|
曹鹏飞
|
a3a59ecb2f
|
Merge remote-tracking branch '惠信/dev_zhangke' into develop
|
2025-08-15 09:58:15 +08:00 |
|
曹鹏飞
|
81da4c6331
|
添加功能
|
2025-08-15 09:44:57 +08:00 |
|
zhangke
|
3bf0bbeee3
|
feat(wms): 新增多个 SAP 业务接口及数据传输对象- 新增转储单、部门领料单、部门退料单、委外订单等业务的 DTO 和 QO 类
- 在 SapService 中实现相关业务的 SAP接口调用方法
- 更新单元测试用例，覆盖新接口的测试
|
2025-08-14 20:30:52 +08:00 |