Commit Graph
237 Commits
Author SHA1 Message Date
lym cc6b56b0cc excel读DO 2024-05-14 16:02:21 +08:00
lym 1aa6626e56 Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-05-11 10:23:53 +08:00
lym 3cef4142fe 生产单管理 2024-05-11 10:23:46 +08:00
liuzhaotian 643e0ee3a0 生产工序代码-打包接口修改 2024-05-10 16:27:43 +08:00
liuzhaotian d9735d3e49 生产工序代码-PlateDetail板ID参数修改 2024-05-09 17:11:10 +08:00
liuzhaotian 94818069cd 生产工序代码-排单-新增排单-板件参数,SQL修改 2024-05-09 16:15:50 +08:00
lym f97615bd7a Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-05-09 15:28:46 +08:00
lym f847b52ba4 api数据 2024-05-09 15:28:35 +08:00
liuzhaotian c358e6c680 生产工序代码-排单-新增排单-SQL修改 2024-05-09 14:25:23 +08:00
liuzhaotian 58846c8dca 生产工序代码-排单-新增排单 2024-05-09 11:51:03 +08:00
liuzhaotian c66efce380 生产工序代码-生产工序-工序板件信息-柜体搜索2.0 2024-05-08 18:05:24 +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 a79935e709 处理manage编译失败 2024-05-08 15:25:10 +08:00
yangsb 826a7a333e 去除manage 的job依赖 2024-05-08 15:16:26 +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
liuzhaotian 0ab10aec86 生产工序代码-生产工序-查看板件信息修改 2024-05-07 19:27:30 +08:00
liuzhaotian 4905cf9895 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java
2024-05-07 17:11:35 +08:00
liuzhaotian 10ae0caf1f 生产工序代码-生产工序新增查询当前工序信息 2024-05-07 17:10:09 +08:00
yangsb 05ea76db59 处理编译失败 2024-05-07 16:55:45 +08:00
yangsb 48c38949c0 处理编译异常 2024-05-07 16:54:28 +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
liuzhaotian 8788eef90d Merge remote-tracking branch 'origin/main' 2024-05-07 16:08:10 +08:00
liuzhaotian f8feff618f 生产工序代码-生产工序参数修改 2024-05-07 16:07:53 +08:00
yangsb 6ab5565fca 处理获取未排单的板材生产单板材分页列表接口异常 2024-05-07 11:25:48 +08:00
liuzhaotian acc6d2e431 Merge remote-tracking branch 'origin/main' 2024-05-07 11:04:48 +08:00
liuzhaotian cb987c6ec5 生产工序代码-生产工序修改 2024-05-07 11:04:37 +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 83e5324257 添加组织联系人手机参数验证 2024-04-30 17:42:23 +08:00
yangsb 5a96ab08a9 修复组织分页接口 sql or连接异常 2024-04-30 16:27:44 +08:00
yangsb e362f74ee2 处理用户分页查询sql ,or连接异常 2024-04-30 16:12:33 +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 3ad488c972 处理组织分页接口异常 2024-04-30 15:10:40 +08:00
liuzhaotian f9a245bbaa Merge remote-tracking branch 'origin/main' 2024-04-30 15:08:08 +08:00
liuzhaotian 2e48b02237 生产工序代码-查询生产单工序组状态代码修改 2024-04-30 15:07:56 +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
lym 5b06fca087 Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-04-29 09:22:55 +08:00
lym 5a56d2734c 数据结构修改 2024-04-29 09:22:49 +08:00