Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity
853 Commits 2 Branches 1 Tag
3252fc9c842f988c6662cf3acb4c166bf5b2cff1
Commit Graph
219 Commits
Author SHA1 Message Date
liuzhaotian 3a5d688304 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderBody/OrderBodyMapper.java
 2024-07-02 16:14:49 +08:00
liuzhaotian 9c6ed3c68d 新增排单-板材分组接口新增；优化生产新增小板接口新增 2024-07-02 16:13:05 +08:00
lym 5418cfdbdf 余料库新增纹理字段 2024-07-02 11:17:18 +08:00
liuzhaotian 3bcb689952 204打包分页异常处理2.0 2024-06-29 18:59:02 +08:00
liuzhaotian 5cb94b9afc 204打包分页异常处理 2024-06-29 18:42:16 +08:00
liuzhaotian e46faca8d7 Merge remote-tracking branch 'origin/main' 2024-06-29 18:29:31 +08:00
lym e7a8afd4f6 Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-06-29 17:36:16 +08:00
lym c990627f36 余料库逻新增辑修改 2024-06-29 17:36:10 +08:00
liuzhaotian 01c02bc6cc 分页打包数据对应修正-新增排单：板材分组接口新增 2024-06-29 16:13:03 +08:00
liuzhaotian d491c6d796 Merge remote-tracking branch 'origin/main' 2024-06-29 10:16:01 +08:00
liuzhaotian 6e1e0307d4 打包-以打包板材过滤 2024-06-29 10:15:50 +08:00
lym 7454908597 余料库逻辑修改，柜体删除修改1 2024-06-28 18:53:52 +08:00
lym 0b6ffa3500 余料库逻辑修改，柜体删除修改 2024-06-28 18:52:29 +08:00
liuzhaotian a4342d0126 禅道Bug修改 2024-06-28 17:12:21 +08:00
liuzhaotian 9d3682a3f9 排单管理-新增排单Bug修改 2024-06-28 10:34:16 +08:00
gaoqr c728fac6fb 排单管理-余料入库的@PreAuthorize权限串修改 2024-06-27 17:59:12 +08:00
gaoqr 9a79ef13b4 Merge remote-tracking branch 'origin/main' 2024-06-27 16:28:19 +08:00
gaoqr de423d9b75 排单管理-余料入库的@PreAuthorize权限串修改 2024-06-27 16:28:02 +08:00
liuzhaotian 191e8dfff1 打包查询-返回参数增加 2024-06-27 14:02:01 +08:00
liuzhaotian b4da805924 Merge remote-tracking branch 'origin/main' 2024-06-26 19:09:00 +08:00
liuzhaotian 1083e75aa4 新增排单-打包查询-工序加工bug修改 2024-06-26 19:08:41 +08:00
lym 7f7ac18ed3 板材纹路字段修改 2024-06-26 17:51:26 +08:00
liuzhaotian 8e5d71bf4b 基础配置权限修改，禅道-模糊，工序Bug修改 2024-06-26 14:56:15 +08:00
liuzhaotian 5b9ead86d1 Merge remote-tracking branch 'origin/main' 2024-06-25 18:04:37 +08:00
liuzhaotian 130d293ce5 打包分页模糊，工序权限修改 2024-06-25 18:04:21 +08:00
lym 1847bbde15 板材纹路、查询排序修改 2024-06-25 17:52:08 +08:00
liuzhaotian a06a1deecf Merge remote-tracking branch 'origin/main' 2024-06-25 16:01:40 +08:00
liuzhaotian 2f43b11fee 修改-根据多个排单号查询板材数据 2024-06-25 16:01:18 +08:00
gaoqr a3fec229a4 新增OrganProperties.superAdminProdOrgIgnoreEnable，配置位置为chenfeng.organ.superadmin-prod-org-ignore-enable，支持配置后在超管的情况下也塞入organid 2024-06-25 11:53:56 +08:00
liuzhaotian 9fee8cceee Merge remote-tracking branch 'origin/main' 2024-06-25 09:39:24 +08:00
liuzhaotian c5775f8638 打包接口，工序加工-板材类型查询修改 2024-06-25 09:39:05 +08:00
lym 280beb808a 备注信息调整 2024-06-25 09:12:43 +08:00
liuzhaotian 40eb10a021 包裹拆包返回数据修改-2.0 2024-06-22 09:59:21 +08:00
liuzhaotian 103d0bdf1e 包裹拆包返回数据修改 2024-06-22 09:51:58 +08:00
liuzhaotian 02d207d0c5 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml
#	cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml
#	cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
 2024-06-21 18:27:37 +08:00
liuzhaotian 484826b90a MyCat-SQL语句冲突部分修改 2024-06-21 18:24:05 +08:00
lym b2cffad9cf 配件成倍、多工序组、sql语句修正1 2024-06-21 12:00:38 +08:00
lym 4fdceb11c4 配件成倍、多工序组、sql语句修正 2024-06-21 11:57:07 +08:00
liuzhaotian 1934325f00 工序加工204Bug修改，根据排单ID查询板材信息接口新增 2024-06-21 10:11:38 +08:00
liuzhaotian ab1384ccd1 打包接口参数修改，工序加工bug修改 2024-06-20 16:34:10 +08:00
liuzhaotian 5acf0b2d6b Merge remote-tracking branch 'origin/main' 2024-06-19 17:35:35 +08:00
liuzhaotian 2720d28706 排单接口参数修改，获得生产单数据源新增包裹和配件信息 2024-06-19 17:35:19 +08:00
gaoqr d9ac56bf35 生产单管理加工状态接口的@PreAuthorize权限串修改 2024-06-19 17:02:21 +08:00
gaoqr 7523dab74d 排单管理中的@PreAuthorize权限串修改 2024-06-19 16:50:21 +08:00
liuzhaotian 168ec904e5 工序加工Bug修改 2024-06-18 19:13:14 +08:00
liuzhaotian c64538ed1f 多个订单查询板材，计件工资查询接口修改 2024-06-18 17:17:54 +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 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 b4b55cc5d2 工序加工Bug修改 2024-06-17 14:12:33 +08:00