Commit Graph
-
e0ad1a7Merge pull request 'bom添加权限' (#57) from lingxiao into develop by 2021-12-15 16:56:51 +0800 -
3f8ed3d(refs/pull/57/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into lingxiao by 2021-12-15 16:50:15 +0800 -
9f7a794bom添加权限 by 2021-12-15 16:50:02 +0800 -
4c87f13Merge pull request '修改物料主数据添加修改表单' (#56) from xuxiaoming into develop by 2021-12-15 16:26:17 +0800 -
3533f00(refs/pull/56/head) Merge branch 'develop' into xuxiaoming by 2021-12-15 16:25:22 +0800 -
147e55c修改物料主数据添加修改表单 by 2021-12-15 16:25:21 +0800 -
a6440d0Merge pull request '将ArtSpec1改为ArtTypeId' (#55) from wangxy into develop by 2021-12-15 15:59:47 +0800 -
c0e9b63(refs/pull/55/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into wangxy by 2021-12-15 15:52:51 +0800 -
6be19d7将ArtSpec1改为ArtTypeId by 2021-12-15 15:52:31 +0800 -
a2604b1Merge pull request '完成拖拽条添加' (#54) from xuxiaoming into develop by 2021-12-15 15:51:55 +0800 -
24ec201(refs/pull/54/head) 修改物料ID下拉列表 by 2021-12-15 15:47:52 +0800 -
6851e60完成拖拽条添加 by 2021-12-15 15:25:13 +0800 -
99369a5Merge branch 'develop' into xuxiaoming by 2021-12-15 14:52:50 +0800 -
9e0ec25添加拖拽条 by 2021-12-15 14:52:49 +0800 -
591c08dMerge pull request '原材料需求差异分析更改查询逻辑' (#53) from wangxy into develop by 2021-12-15 14:52:21 +0800 -
cff418a(refs/pull/53/head) 原材料需求差异分析更改查询逻辑 by 2021-12-15 13:38:23 +0800 -
5a69de4Merge pull request '设置主生产计划,客户需求部分不可修改' (#52) from xuxiaoming into develop by 2021-12-15 10:37:07 +0800 -
61b9cb9(refs/pull/52/head) Merge branch 'develop' into xuxiaoming by 2021-12-15 10:34:56 +0800 -
301c085设置主生产计划,客户需求部分不可修改 by 2021-12-15 10:34:55 +0800 -
3e4754a添加同步库存功能 by 2021-12-14 16:47:05 +0800 -
3e77dddMerge pull request '修改API' (#51) from xuxiaoming into develop by 2021-12-13 18:02:17 +0800 -
7667450(refs/pull/51/head) Merge branch 'develop' into xuxiaoming by 2021-12-13 18:01:28 +0800 -
7b717c0修改请求API by 2021-12-13 18:01:27 +0800 -
95d7aacMerge pull request '修改主生产计划图标显示' (#50) from xuxiaoming into develop by 2021-12-13 17:58:53 +0800 -
1788f56(refs/pull/50/head) Merge branch 'develop' into xuxiaoming by 2021-12-13 17:57:47 +0800 -
bc7c9f0修改主生产计划图标显示 by 2021-12-13 17:57:46 +0800 -
5bc5e2dMerge pull request '修改主生产计划初始化问题' (#49) from xuxiaoming into develop by 2021-12-13 09:14:14 +0800 -
4ee2b63(refs/pull/49/head, refs/pull/48/head) 修改主生产计划初始化问题 by 2021-12-13 09:11:27 +0800 -
b422accMerge branch 'develop' into xuxiaoming 修改主数据 by 2021-12-10 17:18:53 +0800 -
eb58f64增加物料主数据一个组批数量 by 2021-12-10 17:18:53 +0800 -
454ee68Merge pull request '修改主计划刷新按钮逻辑' (#47) from xuxiaoming into develop by 2021-12-10 15:25:13 +0800 -
cd12b9b(refs/pull/47/head) Merge branch 'develop' into xuxiaoming by 2021-12-10 15:24:01 +0800 -
a2b95da修改主计划刷新按钮逻辑 by 2021-12-10 15:24:01 +0800 -
61ba898Merge pull request '计算MPS时保留选中行' (#46) from xuxiaoming into develop by 2021-12-10 14:32:47 +0800 -
4e78dd4(refs/pull/46/head) Merge branch 'develop' into xuxiaoming by 2021-12-10 14:31:42 +0800 -
1e1e232计算MPS时保留选中行 by 2021-12-10 14:31:42 +0800 -
41cce9cMerge pull request '客户需求管理工作台优化' (#45) from wangxy into develop by 2021-12-10 13:58:27 +0800 -
787e9d0(refs/pull/45/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into wangxy by 2021-12-10 13:53:46 +0800 -
b8cca03Merge pull request '修改MPS计算逻辑' (#44) from xuxiaoming into develop by 2021-12-10 13:53:13 +0800 -
e2b80af(refs/pull/44/head, refs/pull/43/head) 修改MPS计算逻辑1 by 2021-12-10 13:51:33 +0800 -
0afa899客户需求管理工作台优化 by 2021-12-10 13:16:58 +0800 -
630aa44Merge branch 'develop' into xuxiaoming by 2021-12-10 12:57:32 +0800 -
cbc55db修改MPS计算逻辑 by 2021-12-10 12:57:31 +0800 -
6a48261Merge pull request '原材料需求差异分析优化' (#42) from wangxy into develop by 2021-12-10 11:14:06 +0800 -
67b3a87(refs/pull/42/head) 原材料需求差异分析优化 by 2021-12-10 11:12:21 +0800 -
314f0e3Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into wangxy by 2021-12-10 10:54:02 +0800 -
419a303优化 by 2021-12-10 10:53:42 +0800 -
302bed3Merge pull request '重构代码' (#41) from xuxiaoming into develop by 2021-12-09 10:18:25 +0800 -
4d58ad3(refs/pull/41/head) Merge branch 'develop' into xuxiaoming by 2021-12-09 10:16:11 +0800 -
a244ca0重构主生产计划部分代码 by 2021-12-09 10:16:08 +0800 -
8091045Merge pull request '主生产计划客户需求图显示文字，MPS计划量改为 净生产量' (#40) from xuxiaoming into develop by 2021-12-08 16:14:05 +0800 -
1582c70(refs/pull/40/head) 主生产计划客户需求图显示文字，MPS计划量改为 净生产量 by 2021-12-08 16:13:15 +0800 -
7e01e95Merge pull request '修改主生产计划，客户需求图显示文字，MPS计划量改为 净生产量' (#39) from xuxiaoming into develop by 2021-12-08 16:09:38 +0800 -
744274e(refs/pull/39/head) Merge branch 'develop' into xuxiaoming by 2021-12-08 16:09:01 +0800 -
81d46a6修改主生产计划，客户需求图显示文字，MPS计划量改为 净生产量 by 2021-12-08 16:08:01 +0800 -
4a8a6d7Merge pull request '修改客户树 选中样式' (#38) from xuxiaoming into develop by 2021-12-08 14:41:25 +0800 -
d845efc(refs/pull/38/head) 修改客户树 选中样式 by 2021-12-08 14:40:05 +0800 -
4649003Merge branch 'develop' into xuxiaoming by 2021-12-08 14:39:35 +0800 -
d1e4c9aMerge pull request '添加主生产计划 下方区域推拉条' (#37) from xuxiaoming into develop by 2021-12-07 17:58:59 +0800 -
86785fa(refs/pull/37/head) Merge branch 'develop' into xuxiaoming by 2021-12-07 17:58:35 +0800 -
50a0f00Merge branch 'develop' into xuxiaoming by 2021-12-07 17:57:47 +0800 -
bbfa560添加主生产计划 下方区域推拉条 by 2021-12-07 17:57:16 +0800 -
297993aMerge pull request '物料主数据维护' (#36) from wangxy into develop by 2021-12-06 09:51:36 +0800 -
928db3b(refs/pull/36/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into wangxy by 2021-12-06 09:49:40 +0800 -
402e8c5物料主数据维护 by 2021-12-06 09:48:57 +0800 -
87f49c8Merge pull request '修改MPS计划量显示不正确问题' (#35) from xuxiaoming into develop by 2021-12-03 18:01:14 +0800 -
44afd2f(refs/pull/35/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into xuxiaoming by 2021-12-03 17:59:07 +0800 -
bbc21c2修改MPS计划量显示不正确问题 by 2021-12-03 17:58:48 +0800 -
e967e51Merge pull request '原材料需求差异分析' (#34) from wangxy into develop by 2021-12-03 17:06:48 +0800 -
ca1e03f(refs/pull/34/head) 原材料需求差异分析 by 2021-12-03 16:43:49 +0800 -
8c393bbMerge pull request '客户需求模型新增字段、原材料需求差异分析需求更改' (#33) from wangxy into develop by 2021-12-03 16:11:57 +0800 -
2a09b59(refs/pull/33/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into wangxy by 2021-12-03 16:10:17 +0800 -
cdc3be7客户需求模型新增字段、原材料需求差异分析需求更改 by 2021-12-03 16:09:58 +0800 -
5bb04e1Merge pull request '修改主生产计划合并单元格问题' (#32) from xuxiaoming into develop by 2021-12-03 15:09:45 +0800 -
e9f44e6Merge branch 'develop' into xuxiaoming by 2021-12-03 15:08:22 +0800 -
6169363(refs/pull/32/head) Merge branch 'develop' into xuxiaoming by 2021-12-03 15:07:25 +0800 -
4123799修改主生产计划合并单元格问题 by 2021-12-03 14:52:57 +0800 -
524e9ccMerge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into wangxy by 2021-12-02 18:08:38 +0800 -
6ce351a偏差分析优化 by 2021-12-02 18:08:13 +0800 -
0ce4cf0Merge pull request '编写日生产计划静态页面' (#31) from xuxiaoming into develop by 2021-12-02 17:39:14 +0800 -
02a87f8(refs/pull/31/head) 编写生产日计划页面 by 2021-12-02 17:36:28 +0800 -
f452f7d添加日生产计划 by 2021-12-02 17:17:35 +0800 -
a144d85Merge pull request '修改错误信息提示' (#30) from xuxiaoming into develop by 2021-12-02 09:51:31 +0800 -
924c795(refs/pull/30/head) Merge branch 'develop' into xuxiaoming by 2021-12-02 09:44:04 +0800 -
b774d95Merge branch 'xuxiaoming' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into xuxiaoming by 2021-12-02 09:43:32 +0800 -
a0de65e修改错误信息提示 by 2021-12-02 09:43:14 +0800 -
30c7d20Merge pull request '根据新需求修改主生产计划页面' (#29) from xuxiaoming into develop by 2021-12-02 09:28:34 +0800 -
afb0e10(refs/pull/29/head) Merge branch 'develop' into xuxiaoming by 2021-12-02 09:26:07 +0800 -
d81d4feMerge branch 'develop' into xuxiaoming by 2021-12-02 09:22:43 +0800 -
1a8b100修改因修改数据结构而引起的bug by 2021-12-02 09:21:42 +0800 -
d94bcc2修改图标有时不显示问题 by 2021-12-01 17:20:55 +0800 -
06e08b6完成新需求修改 by 2021-12-01 13:13:43 +0800 -
93df2d0Merge pull request '标准属性定义-属性ID字段类型修改' (#28) from wangxy into develop by 2021-11-29 14:33:09 +0800 -
7898d2c(refs/pull/28/head) 标准属性定义-属性ID字段类型修改 by 2021-11-29 14:25:54 +0800 -
246fcd9重构客户预测需求评审代码 by 2021-11-29 10:49:03 +0800 -
fb26c5dMerge pull request '标准属性定义优化、客户需求管理工作台新增批量导入' (#27) from wangxy into develop by 2021-11-26 16:41:08 +0800 -
ef90cd8(refs/pull/27/head) 标准属性定义优化、客户需求管理工作台新增批量导入 by 2021-11-26 16:39:08 +0800 -
66d5eb6标准属性定义去掉属性值 by 2021-11-26 15:39:19 +0800 -
9fbed02Merge pull request '客户主数据维护优化' (#26) from wangxy into develop by 2021-11-25 17:07:42 +0800 -
2af59a0(refs/pull/26/head) 客户主数据维护优化 by 2021-11-25 17:04:47 +0800