70 Commits

Include renames

Author	SHA1	Message	Date
liuzhaotian	c64538ed1f	多个订单查询板材，计件工资查询接口修改	2024-06-18 17:17:54 +08:00
gaoqr	6d9a9a602f	Merge remote-tracking branch 'origin/main'	2024-06-17 18:48:06 +08:00
gaoqr	f0792baff4	主要微服务（gateway、system、mgn、exec）打包方式修改： ... 1、支持根据profile打包不同配置在jar外； 2、依赖lib打包在jar外； 3、增加test相关配置；	2024-06-17 18:47:52 +08:00
lym	6d7b76894e	工序名校验修改	2024-06-17 18:11:42 +08:00
lym	724bb7e9e0	Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server	2024-06-17 16:07:38 +08:00
lym	387de1e86a	改为orders	2024-06-17 16:07:29 +08:00
liuzhaotian	d0a4f5b89b	开料排单Bug修改	2024-06-14 18:44:08 +08:00
lym	283d46e492	生产单管理更新还原、作废等接口	2024-06-14 17:08:07 +08:00
lym	2c58e73d7c	生产单管理更新还原等接口	2024-06-14 16:55:43 +08:00
liuzhaotian	0d25e7cea3	排单异常修改	2024-06-14 16:40:56 +08:00
liuzhaotian	350c6c940a	executor模块查询新增组织ID，删除排单接口逻辑修改	2024-06-14 15:46:25 +08:00
liuzhaotian	40b78e6fcd	排单Bug修改-生产工序查询SQL增加组织ID	2024-06-12 10:49:26 +08:00
lym	ee5e6e0ccd	Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server	2024-06-11 10:04:18 +08:00
lym	2e1c673be2	余料库接口完善修改	2024-06-11 10:04:09 +08:00
liuzhaotian	db8a1cc6ed	错误修改	2024-06-07 18:36:24 +08:00
liuzhaotian	6b1277384c	Merge remote-tracking branch 'origin/main' ... # Conflicts: # cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java # cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java # cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml	2024-06-07 18:21:31 +08:00
liuzhaotian	6d5b232d7a	优化生产保存接口-获得生产单数据源接口逻辑修改-新增排单接口逻辑修改	2024-06-07 18:18:57 +08:00
gaoqr	9c303e6354	1、枚举统一魔法值 ... 2、错误码规范 3、部分sql语句增加条件走索引，mycat语法修正	2024-06-07 15:22:12 +08:00
lym	1d5c0dd0de	预料管理修改1	2024-06-06 09:25:27 +08:00
lym	026b761c29	报表导出1	2024-06-04 16:50:28 +08:00
lym	671d3701e4	造型数据修改	2024-05-30 17:41:37 +08:00
liuzhaotian	ed7b782f38	Merge remote-tracking branch 'origin/main'	2024-05-29 14:09:47 +08:00
liuzhaotian	62ec2c105a	排单接口 - bug和参数修改	2024-05-29 14:09:34 +08:00
lym	e191888693	Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server	2024-05-28 18:17:26 +08:00
lym	a2e57e91e7	文件上产下载修改	2024-05-28 18:17:14 +08:00
liuzhaotian	31def6fdf2	排单接口 - 查询排单分页bug修改	2024-05-28 14:31:24 +08:00
lym	902d62e17a	bug解决	2024-05-27 09:19:37 +08:00
lym	a13c17ec3b	bug修改	2024-05-27 09:14:09 +08:00
liuzhaotian	7d14c155a8	排单接口 -- 查询未排单的生产单列表bug修改，api数据导入异常数据回滚	2024-05-24 15:03:09 +08:00
liuzhaotian	f247866769	获取生产单源数据-优化时的数据参数修改	2024-05-22 15:23:50 +08:00
liuzhaotian	2b4051ff9e	获得生产单数据源参数修改	2024-05-21 10:38:53 +08:00
liuzhaotian	f2d7b6dc30	MyCat分表Organ_Id字段自动添加-获得生产单数据源参数添加	2024-05-20 17:32:00 +08:00
liuzhaotian	27eea2dd24	优化排单-生产单数据参数修改-孔字段添加	2024-05-18 14:19:26 +08:00
liuzhaotian	70dece2d79	优化排单-生产单数据参数修改2.0	2024-05-18 10:48:42 +08:00
liuzhaotian	f7971c7209	优化排单-生产单数据参数修改	2024-05-18 10:01:04 +08:00
liuzhaotian	48e6f36719	优化排单-生产单全部数据返回	2024-05-17 17:45:45 +08:00
liuzhaotian	e4859249d3	生产单板件-获得生产单板件接口参数修改	2024-05-15 16:02:54 +08:00
lym	3cef4142fe	生产单管理	2024-05-11 10:23:46 +08:00
liuzhaotian	94818069cd	生产工序代码-排单-新增排单-板件参数，SQL修改	2024-05-09 16:15:50 +08:00
liuzhaotian	c358e6c680	生产工序代码-排单-新增排单-SQL修改	2024-05-09 14:25:23 +08:00
liuzhaotian	58846c8dca	生产工序代码-排单-新增排单	2024-05-09 11:51:03 +08:00
yangsb	305828f352	修改创建排单的接口参数	2024-05-08 15:08:26 +08:00
yangsb	6ab5565fca	处理获取未排单的板材生产单板材分页列表接口异常	2024-05-07 11:25:48 +08:00
yangsb	6d6765cf9f	未排单的板材生产单板材分页列表接口出入参修改	2024-04-29 13:53:05 +08:00
yangsb	2d7dd7cbfb	新增机台下拉选项接口	2024-04-29 09:10:30 +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	dc3f2c854f	sql修改	2024-04-28 11:38:22 +08:00
lym	53937f842b	bug修改	2024-04-24 19:28:21 +08:00
yangsb	5ff48fa2ed	去除前端传递organ-id依赖	2024-04-19 11:56:28 +08:00