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-14 13:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
571 Commits 2 Branches 1 Tag
4ce3b17212e31d1dd22152bf747bf55aa6debcf4
Commit Graph
123 Commits
Author SHA1 Message Date
lym 4ce3b17212 二版更新-定时任务50% 2024-08-09 09:37:52 +08:00
gaoqr ea53d09634 分析页统计：1、接口支持超管忽视机构查看全部；2、图表接口回调X轴日期格式完善； 2024-08-08 11:02:45 +08:00
gaoqr 2a7f19d69f 分析页统计：小板数量、小板面积统计接口实现 2024-08-07 18:35:27 +08:00
gaoqr adc2e8806a 分析页统计：生产单状态、生产单/排单单量、生产单/排单平方数统计接口实现和完善 2024-08-07 15:59:49 +08:00
gaoqr 90f845a4fc 分析页统计：生产单状态mapper抽象独立接口、补充注解 2024-08-07 09:46:43 +08:00
gaoqr f737c17866 分析页统计：生产单状态统计接口实现 2024-08-06 18:31:22 +08:00
gaoqr 483e2dcb99 分析页统计：五个数量统计接口完善 2024-08-06 09:25:33 +08:00
gaoqr bfcc070b94 报表基础模块：新增支持生产单报表 （配件汇总/明细）导出 2024-07-30 10:33:00 +08:00
liuzhaotian e7447c4a8c Merge remote-tracking branch 'origin/main' 2024-07-18 18:39:30 +08:00
liuzhaotian ccd6a390cc 排单-去除排单号-planNo 2024-07-18 18:39:08 +08:00
lym 5116e6d74a 文件导入新改 2024-07-18 15:45:05 +08:00
liuzhaotian 5f26418d08 Merge remote-tracking branch 'origin/main' 2024-07-17 10:22:05 +08:00
liuzhaotian 1ca74cf233 优化生产-加工组信息Bug修改 2024-07-17 10:21:54 +08:00
lym aa09d8e96c 首页-新统计1 2024-07-15 18:20:42 +08:00
liuzhaotian 7343b4c5ec 解决-计算用板量和优化生产小板重复 2024-07-12 14:41:41 +08:00
lym 02c4da859b 首页-统计1 2024-07-11 17:36:18 +08:00
lym 044bdb3163 生产单管理-列表时间修改 2024-07-11 09:31:15 +08:00
lym c1ed17a672 bug修改-名称修改 2024-07-09 17:49:04 +08:00
liuzhaotian d28d941680 计算用板量Bug修改 2024-07-09 10:58:23 +08:00
liuzhaotian fbb57ab252 机台删除，工序加工，排单加工时间，排单数据筛选Bug修改 2024-07-08 18:25:20 +08:00
liuzhaotian b0d4dc684d 新增排单-板材分组接口修改 2024-07-04 15:26:49 +08:00
liuzhaotian 0a364a2ec0 Merge remote-tracking branch 'origin/main' 2024-07-03 11:45:13 +08:00
liuzhaotian 49a88b2e87 优化生产权限修改，新增空小板Bug修改 2024-07-03 11:44:58 +08:00
lym c80847eb48 生产单删除改为物理删除 2024-07-03 11:40:13 +08:00
lym b3fe53fbbc Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-07-02 17:45:58 +08:00
lym 0fbb2cf76b 配件汇总、板材库查询修改 2024-07-02 17:45:50 +08:00
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
lym b326d15605 生产单添加空单状态以及空单相关修改 2024-07-01 17:05:56 +08:00
liuzhaotian 01c02bc6cc 分页打包数据对应修正-新增排单：板材分组接口新增 2024-06-29 16:13:03 +08:00
lym 7454908597 余料库逻辑修改，柜体删除修改1 2024-06-28 18:53:52 +08:00
lym 0b6ffa3500 余料库逻辑修改，柜体删除修改 2024-06-28 18:52:29 +08:00
liuzhaotian 9d3682a3f9 排单管理-新增排单Bug修改 2024-06-28 10:34:16 +08:00
liuzhaotian abe876f872 禅道排单Bug修改 2024-06-27 19:13:46 +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 130d293ce5 打包分页模糊，工序权限修改 2024-06-25 18:04:21 +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
lym ee7a0deac2 bug修改异形板数 2024-06-24 10:13:09 +08:00
lym 8c8b82c65f Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-06-22 09:15:13 +08:00
lym a14d1594e8 工序修改 2024-06-22 09:15:02 +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