Commit Graph

167 Commits

Author SHA1 Message Date
曹鹏飞 c3799fe052 feat: bug-739 钢构件搜索的机台号改为通过机台编号模糊搜索 2025-09-25 11:25:15 +08:00
曹鹏飞 a033aa2b5e feat: bug-739 钢构件搜索的机台号改为通过机台编号模糊搜索 2025-09-25 10:57:30 +08:00
曹鹏飞 11b4dd11b4 feat: bug-721 钢构件版本号支持字母+数字 2025-09-25 10:21:02 +08:00
zhangke e2a516abae 1、修改授权的方式 2025-09-25 09:29:35 +08:00
zhangke 7d1a3750ef 1、修改供應商沒有開通權限的時候,刪除報錯的問題
2、修改刪除用戶的 接口方式
2025-09-25 09:20:36 +08:00
曹鹏飞 d210cd94c5 一些优化 2025-09-24 16:56:47 +08:00
zhangke f4b2ef7608 Merge branch 'refs/heads/rakor' into dev_zhangke 2025-09-24 16:39:19 +08:00
zhangke 51e56cdf0c source type 2025-09-24 16:38:58 +08:00
曹鹏飞 7cc07aac8b 登录名不区分大小写 2025-09-24 09:50:44 +08:00
曹鹏飞 f999fae1e5 一些优化 2025-09-24 09:04:54 +08:00
曹鹏飞 9f8b4890a5 一些优化 2025-09-24 08:56:59 +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
曹鹏飞 93a8819d8d 一些优化 2025-09-22 17:47:51 +08:00
zhangke 9d327f9ed1 新增无码收货和无码上架的功能 2025-09-21 23:06:27 +08:00
zhangke 8eb712741f 1、添加无码收货的,功改了一半 2025-09-19 21:23:19 +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
曹鹏飞 ac075c26b3 一些优化 2025-09-12 18:03:23 +08:00
zhangke 65b8972b1a 1、零部件出库单搜索调试 2025-09-11 16:24:12 +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
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 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
曹鹏飞 78b5698129 Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into develop 2025-09-04 20:10:39 +08:00
曹鹏飞 e7c1d61009 一些优化 2025-09-04 20:09:52 +08:00
zhangke a357ecb57b 修改库存表的sql语句 2025-09-04 14:45:58 +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 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