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
940 Commits 2 Branches 1 Tag
e414b7782bbb66b58d5dc74e7bdbbb74831cd574
Commit Graph
488 Commits
Author SHA1 Message Date
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
liuzhaotian a1639989f1 新增排单查询Bug修改 2024-06-27 19:42:33 +08:00
liuzhaotian 32961ac069 Merge remote-tracking branch 'origin/main' 2024-06-27 19:13:58 +08:00
liuzhaotian abe876f872 禅道排单Bug修改 2024-06-27 19:13:46 +08:00
gaoqr c728fac6fb 排单管理-余料入库的@PreAuthorize权限串修改 2024-06-27 17:59:12 +08:00
gaoqr de423d9b75 排单管理-余料入库的@PreAuthorize权限串修改 2024-06-27 16:28:02 +08:00
gaoqr 60178a2e3d 排单管理-保存优化的@PreAuthorize权限串修改 2024-06-27 11:38:29 +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 40b88b7856 Merge remote-tracking branch 'origin/main' 2024-06-26 14:56:28 +08:00
liuzhaotian 8e5d71bf4b 基础配置权限修改，禅道-模糊，工序Bug修改 2024-06-26 14:56:15 +08:00
gaoqr 93f33e2ee7 修复一些可能的并发问题 2024-06-26 11:59:44 +08:00
gaoqr ec1fba4dc1 修复一些可能的并发问题 2024-06-26 11:57:41 +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
gaoqr 03de668d9a 1、生产单导入日志标签修改； 
2、系统加载菜单增加组织管理员和普通人的判断；
3、角色菜单授权增加organid和角色的organid统一的处理，解决前端没有传organid导致rolemenu本机构人看不到的情况；
 2024-06-24 18:15:02 +08:00
lym 51a7144d21 bug修改异形板数2 2024-06-24 10:19:02 +08:00
lym 2c581694ad Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-06-24 10:13:18 +08:00
lym ee7a0deac2 bug修改异形板数 2024-06-24 10:13:09 +08:00
liuzhaotian 3c9977a9f8 Merge remote-tracking branch 'origin/main' 2024-06-22 09:59:33 +08:00
liuzhaotian 40eb10a021 包裹拆包返回数据修改-2.0 2024-06-22 09:59:21 +08:00
gaoqr 8d67539064 Merge remote-tracking branch 'origin/main' 2024-06-22 09:56:17 +08:00
gaoqr 564896a8f5 生产单管理导入问题修复： 
1、增加type下模板文件打包到外部，代码通过"包路径/type"进行读取，适配本地环境；
 2024-06-22 09:55:52 +08:00
lym 3b8b2dcfd5 工序修改1.2 2024-06-22 09:21:32 +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
gaoqr 64051e9919 生产单管理导入问题修复： 
1、增加type下模板文件打包到外部，代码通过"包路径/execFile"进行读取；
2、修改文件分隔符自适应；
 2024-06-21 16:23:59 +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 3d0c824303 Merge remote-tracking branch 'origin/main' 2024-06-20 16:38:06 +08:00
liuzhaotian ab1384ccd1 打包接口参数修改，工序加工bug修改 2024-06-20 16:34:10 +08:00
lym d8c3f185bc 新增备注es2 2024-06-19 18:00:28 +08:00
lym b6a9e13ee0 Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-06-19 17:44:28 +08:00
lym 24dc1f728f 新增备注es 2024-06-19 17:44:19 +08:00
liuzhaotian 5acf0b2d6b Merge remote-tracking branch 'origin/main' 2024-06-19 17:35:35 +08:00