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-13 05:12:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
521 Commits 2 Branches 1 Tag
d9999377c90063f599ef9a4f10381dbdbd4fcec6
Commit Graph
283 Commits
Author SHA1 Message Date
liuzhaotian 954304d722 Merge remote-tracking branch 'origin/main' 2024-07-22 11:17:31 +08:00
liuzhaotian 87a285c6af 允许外部配件重复，新增预打包接口 2024-07-22 11:17:13 +08:00
lym 366bd5084c 板材库去掉价格2 2024-07-19 18:12:49 +08:00
lym 6ffcdba99f Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-07-19 16:00:58 +08:00
lym e0253d3011 板材库去掉价格 2024-07-19 16:00:47 +08:00
liuzhaotian c9788110fb 排单参数修改 2024-07-19 09:40:02 +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 14e326c251 文件导入新改-修改 2024-07-18 18:20:10 +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 e6cd2b9540 打包状态，生产单状态，工序加逻辑修改 2024-07-12 18:44:39 +08:00
liuzhaotian ec26101796 解决-计算用板量和优化生产小板重复-参数缺少解决 2024-07-12 14:47:21 +08:00
liuzhaotian 7343b4c5ec 解决-计算用板量和优化生产小板重复 2024-07-12 14:41:41 +08:00
lym 02c4da859b 首页-统计1 2024-07-11 17:36:18 +08:00
lym 0aafe646b6 Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-07-11 09:31:23 +08:00
lym 044bdb3163 生产单管理-列表时间修改 2024-07-11 09:31:15 +08:00
liuzhaotian 129f919405 Merge remote-tracking branch 'origin/main' 2024-07-10 18:47:54 +08:00
liuzhaotian e3b5567acf 机台,标签接口返回错误修改,打包分页接口条件修改 2024-07-10 18:47:39 +08:00
lym efe85a5d86 生产单管理-api导入列表修改 2024-07-10 10:00:06 +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 094e663fb7 Merge remote-tracking branch 'origin/main' 2024-07-08 18:25:42 +08:00
liuzhaotian fbb57ab252 机台删除，工序加工，排单加工时间，排单数据筛选Bug修改 2024-07-08 18:25:20 +08:00
lym 0e9108d061 bug修改-余料库 2024-07-08 18:10:54 +08:00
lym 4319d6d340 bug修改 2024-07-08 11:54:15 +08:00
lym ed3700d8ef 工序组相关问题修改 2024-07-05 09:49:11 +08:00
liuzhaotian 4465f401c8 优化生产新增空小板接口逻辑修改，分页打包接口板材参数修改 2024-07-04 18:37:26 +08:00
liuzhaotian 7862c8188c 新增排单-板材分组接口Bug修改 2024-07-04 16:06:38 +08:00
liuzhaotian b0d4dc684d 新增排单-板材分组接口修改 2024-07-04 15:26:49 +08:00
liuzhaotian 3d7669a114 余料入库权限问题修改 2024-07-03 15:13:27 +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 22c430ddf4 结束开料接口参数修改 2024-07-02 17:07:26 +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 548b976dc6 生产单添加空单状态以及空单相关修改1 2024-07-01 17:17:00 +08:00
lym b326d15605 生产单添加空单状态以及空单相关修改 2024-07-01 17:05:56 +08:00
liuzhaotian 30f394ef21 排单优先级更改-排单分页去除重复数据 2024-06-29 18:29:07 +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 a4342d0126 禅道Bug修改 2024-06-28 17:12:21 +08:00
liuzhaotian 9d3682a3f9 排单管理-新增排单Bug修改 2024-06-28 10:34:16 +08:00