Commit Graph

407 Commits

Author SHA1 Message Date
5ed5153bb4 opt:优化现场联调产生的一些问题 2024-06-12 18:49:27 +08:00
zhouz
9cb97a4b59 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java
#	lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
2024-06-06 13:52:39 +08:00
3fa97cac25 fix: ACS请求扣除纸管数量 2024-06-04 17:04:04 +08:00
935fdcaf8f fix: 判断纸管、呼叫AGV更换托盘 2024-06-04 15:02:51 +08:00
zhouz
ce3324a8af fix;表处代码修改 2024-06-04 10:37:35 +08:00
ac608ed2ca rev:出库口自动分配 2024-05-31 09:00:14 +08:00
zhouz
5939a0e520 fix:出入库流程修改 2024-05-28 09:26:40 +08:00
zhouz
20904af6d5 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-05-17 17:02:49 +08:00
zhouz
6746f0a088 fix:入库修改 2024-05-17 17:02:43 +08:00
58d0dfa279 opt:优化子卷包装界面样式 2024-05-17 10:28:18 +08:00
96515306bd opt:修改入库木箱获取方式 2024-05-16 17:09:19 +08:00
cf60ace60f fix: 角色权限分配不显示 2024-05-15 09:37:11 +08:00
68b6ddb793 opt:子卷装箱测试 2024-05-14 22:49:10 +08:00
94f09d2397 rev: 空托盘入库托盘类型,仓位顺序,前端页面优化 2024-05-11 17:13:43 +08:00
zhouz
d03c915e92 dev:新增备货区代码 2024-05-09 20:01:54 +08:00
819e8948a0 rev: 分切呼叫套轴不区分锂电标箔,只区分气胀轴尺寸 2024-04-29 08:43:43 +08:00
zhouz
c76498597a Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-04-26 13:28:48 +08:00
zhouz
4b1b5c0552 rev:编码生成BUG,载具新增功能修改 2024-04-26 13:28:42 +08:00
d2275d700f fix: 分切缓存状态修改 2024-04-26 10:33:18 +08:00
zhouz
38fcac9e4a dev:兰州二期生箔修改 2024-04-22 19:02:40 +08:00
zhouz
7443ad209d rev:生箔一期更新 2024-04-18 17:54:02 +08:00
zhouz
e492d71238 rev:查询冷却区点位 2024-04-12 15:53:55 +08:00
2a9cd7b3d0 rev:调式更新 2024-03-13 17:07:29 +08:00
b5efde54cc add: 废箔称重 2024-03-12 18:06:58 +08:00
ff1e3c8dcb add:增加子卷装箱页面功能。 2024-03-11 17:42:45 +08:00
41ed722cee dev:BUG修改 2024-03-08 17:08:11 +08:00
0ad8c2e8b7 fix: 手持权限、任务校验 2024-03-07 17:16:28 +08:00
1224ab4d74 add: 分切CRUD 2024-02-29 11:26:21 +08:00
89371b1d5b rev:测试修改 2024-02-27 19:42:06 +08:00
aca9984d3f rev:代码合并 2024-02-27 09:12:00 +08:00
cfc21279c4 rev:木箱木库测试 2024-02-27 09:06:59 +08:00
b2e2f92202 add: 分切业务开发 2024-02-26 14:29:48 +08:00
ca2dac7816 Merge remote-tracking branch 'origin/b_lms' into b_lms
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
#	lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
2024-02-26 14:24:07 +08:00
621fe7362e add:acstolms 接口 2024-02-22 19:11:38 +08:00
1018b1fac0 rev:空托盘出入库 2024-01-27 15:53:15 +08:00
29ca5f703c refactor: 前端驼峰转下划线 2024-01-27 15:41:13 +08:00
b3da793a4c add:二期出库 2024-01-24 14:01:54 +08:00
d93fe3a4ed add:pc成品入库 2024-01-19 18:36:27 +08:00
c7bf3bf17a rev:新增表处库存点位页面 2024-01-17 10:56:30 +08:00
2b40bf51ee rev:前端页面子卷包装字段位置更换 2024-01-15 14:38:47 +08:00
b4f25156c7 rev:贴标增加开关 2024-01-12 14:36:24 +08:00
9cd78f0d25 rev:出库业务强制确认按钮 2024-01-11 10:56:40 +08:00
e25dd57009 rev:默认时间 2024-01-09 17:40:21 +08:00
fefdead3f5 rev:内包间逻辑优化 2024-01-09 08:38:37 +08:00
zhangzq
eeeffbb708 opt:发货区管理接口优化 2024-01-08 17:39:11 +08:00
f6f19e73a1 rev:logo图标更换 rev:木箱外表打印校验 2024-01-08 09:53:46 +08:00
6bf3f60a51 rev:新-入库查询报表、新-出库查询报表 2023-12-29 13:23:33 +08:00
zhangzq
ca77135394 opt:日志优化 2023-12-28 19:34:08 +08:00
3bbc5dfef3 rev:临期报表 2023-12-28 11:07:28 +08:00
2d20869770 rev:成品日报更新 2023-12-26 17:08:39 +08:00