Commit Graph
104 Commits
Author SHA1 Message Date
liuzhaotian 58846c8dca 生产工序代码-排单-新增排单 2024-05-09 11:51:03 +08:00
liuzhaotian d8b1574499 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	cf-module-prod-manage/cf-module-prod-manage-biz/pom.xml
#	cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/test/TestController.java
2024-05-08 18:04:01 +08:00
liuzhaotian d2a0b45a02 生产工序代码-生产工序-工序板件信息-柜体搜索 2024-05-08 18:01:34 +08:00
yangsb 305828f352 修改创建排单的接口参数 2024-05-08 15:08:26 +08:00
yangsb 1abca14719 新增处理排单号 2024-05-08 14:33:05 +08:00
liuzhaotian ed6b6c5052 生产工序代码-生产工序-工序板件信息查看 2024-05-08 11:05:47 +08:00
yangsb 6a1ae22713 新增设置排单优先级接口 2024-05-07 16:52:43 +08:00
yangsb edf06e059d 修改、修改排单逻辑 2024-05-07 16:36:36 +08:00
yangsb f3d13533b5 处理新增、修改排单的必传字段限制 2024-05-07 16:35:05 +08:00
yangsb 6ab5565fca 处理获取未排单的板材生产单板材分页列表接口异常 2024-05-07 11:25:48 +08:00
yangsb 550e5ca905 新增根据生产单id获取未排单的商品分页列表接口 2024-05-07 09:01:54 +08:00
yangsb 7f081b2e20 新增根据柜体id列表查询小板的造型接口 2024-05-06 14:16:58 +08:00
yangsb f9df266bae 处理编译失败 2024-04-30 15:16:20 +08:00
yangsb fa4ea458b0 no message 2024-04-30 15:12:08 +08:00
yangsb 6cbb7285d3 Merge branch 'main' of http://192.168.1.205:9980/cf_devdept2/cf_imes_server 2024-04-30 14:46:09 +08:00
yangsb 898b2db19b 修改部分字段类型和名称 2024-04-30 14:46:01 +08:00
lym 786038688c Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-04-30 09:14:10 +08:00
lym d5705c9d4b 数据结构修改 2024-04-30 09:14:02 +08:00
yangsb 5b17e35e57 排单查询的过滤参数 2024-04-29 16:59:22 +08:00
yangsb b6a67406e7 排单中小板查询添加异性、造型过滤 2024-04-29 14:48:05 +08:00
yangsb 6d6765cf9f 未排单的板材生产单板材分页列表接口出入参修改 2024-04-29 13:53:05 +08:00
yangsb 2d7dd7cbfb 新增机台下拉选项接口 2024-04-29 09:10:30 +08:00
lym 8bdeb8ae49 bug修改 2024-04-28 20:02:55 +08:00
lym 0d929a06f1 Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-04-28 20:02:23 +08:00
lym d3f84b08f1 bug修改 2024-04-28 20:02:19 +08:00
yangsb 632ff5a0dd 优化批量入库方法,按1000条批量入库 2024-04-28 17:41:52 +08:00
lym e7c74dbb86 Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-04-28 16:59:44 +08:00
lym ac43bf6832 数据结构修改 2024-04-28 16:59:39 +08:00
yangsb c58572a4fb 修改根据排单id获取小板为分页 2024-04-28 16:27:59 +08:00
lym 79d271d7bb Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-04-28 16:14:14 +08:00
lym 95e6477f28 数据结构修改 2024-04-28 16:14:06 +08:00
yangsb ee378e6533 排单分页接口添加字段 2024-04-28 14:53:43 +08:00
yangsb dc3f2c854f sql修改 2024-04-28 11:38:22 +08:00
yangsb 29ef237a0b 排单分页添加商品颜色字段 2024-04-28 10:55:35 +08:00
yangsb 115d4e2f27 新增根据排单id获取生产单分页接口 2024-04-28 10:50:58 +08:00
yangsb 0fb3bca338 修改es索引创建人、修改人字段类型 2024-04-26 14:18:12 +08:00
lym cde7b0269b bug修改 2024-04-25 19:37:43 +08:00
lym 6caedb1e81 bug修改 2024-04-25 14:51:52 +08:00
lym cc00b46d9a bug修改 2024-04-25 14:46:59 +08:00
lym aa7144a090 bug修改 2024-04-25 11:12:49 +08:00
lym 82e388372c bug修改 2024-04-25 11:09:39 +08:00
lym 53937f842b bug修改 2024-04-24 19:28:21 +08:00
lym 3af6472ada 板材工序接口修改 2024-04-19 14:08:50 +08:00
yangsb 5ff48fa2ed 去除前端传递organ-id依赖 2024-04-19 11:56:28 +08:00
yangsb cc521a4a9f 新增获取生产单源数据接口 2024-04-15 16:19:12 +08:00
yangsb 63f8c800d6 新增组织机台授权相关接口 2024-04-15 11:52:14 +08:00
yangsb a452ecc7a5 处理ES字段的mapping映射 2024-04-11 18:02:31 +08:00
lym c7810570db detail修改 2024-04-11 16:59:21 +08:00
yangsb 35fee5454d executor 服务添加ES依赖,添加对小板造型数据入库处理 2024-04-11 16:49:13 +08:00
yangsb 461f9aeb6d 修改组织管理员角色逻辑 2024-04-10 18:17:26 +08:00