Commit Graph

1171 Commits

Author SHA1 Message Date
shijing 0543a90f2b Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-15 14:10:29 +08:00
shijing b8d658b8b4 faceLogin 2022-02-15 14:10:20 +08:00
shilixia 9e5efe57d4 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-15 13:43:19 +08:00
shilixia 74a7f87e9f zuoyezhidaoshu 2022-02-15 13:43:09 +08:00
caoqianming e9e603aaae Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-15 11:12:47 +08:00
caoqianming 42cbd43117 物料计算结果按物料类型和编号排序 2022-02-15 11:12:40 +08:00
shijing 999ad65320 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-15 10:58:12 +08:00
shijing f67989c142 bigScreenTextChange&icons 2022-02-15 10:58:03 +08:00
caoqianming c9ad35b4b5 半成品折合计算 2022-02-15 10:52:10 +08:00
shilixia 438c49d7e1 cishs 2022-02-14 10:59:25 +08:00
shilixia fc558c042c xial 2022-02-14 10:58:41 +08:00
shijing 3409d1b42e Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-14 10:57:49 +08:00
shijing dfe141bf55 iconsChange 2022-02-14 10:57:32 +08:00
caoqianming 39704bade9 wproduct_ticket list 增加workflow字段 2022-02-14 10:48:28 +08:00
caoqianming 264da03d4e 修改为count_workday 2022-02-14 10:12:00 +08:00
caoqianming 1ae6e22b00 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-14 10:09:57 +08:00
caoqianming 070d2b558a 到岗统计增加应到工作日 2022-02-14 10:09:48 +08:00
shijing cc741a47a0 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-11 17:07:57 +08:00
shijing f8cf641e0d bigScreenAdjust&iconschange 2022-02-11 17:07:47 +08:00
caoqianming da9bb2b79d settings同源策略配置 2022-02-11 11:20:44 +08:00
shilixia 089a311768 zuoyezhidaoshbu 2022-02-11 10:56:25 +08:00
shilixia 45ed6d407a zuoyezhidaoshu 2022-02-11 10:49:14 +08:00
shilixia 09a938a146 zuoyezhidaoshu 2022-02-11 10:47:14 +08:00
caoqianming 17982d582a Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-11 08:39:35 +08:00
caoqianming 0d8fe4d7eb 删除material check 只要经过操作就变更物料状态 2022-02-11 08:39:27 +08:00
shijing 0e178f2f92 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-10 16:35:22 +08:00
shijing 08dc30c659 dumoCheck 2022-02-10 16:35:13 +08:00
shilixia 7990533f2f Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-10 16:33:59 +08:00
shilixia ef7045b751 chakanyuandingdan 2022-02-10 16:33:53 +08:00
caoqianming 71bd7dfb0d update inm bug 2022-02-10 16:26:26 +08:00
shilixia fab4ef2571 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-10 16:07:15 +08:00
shilixia bacddddca0 ciagoudingdanxiang 2022-02-10 16:07:08 +08:00
caoqianming 3744f417f7 fifo item create bug 2022-02-10 15:25:09 +08:00
caoqianming ea5a7509e7 update_wproduct_by_test is_midtesting 2022-02-10 15:00:26 +08:00
caoqianming 6eeb6c906b test record update item 2022-02-10 14:41:32 +08:00
caoqianming 5ad5d9ad4b test record update item 2022-02-10 14:40:21 +08:00
caoqianming 41ba0ce532 puorder item detail 2022-02-10 14:33:14 +08:00
caoqianming 74fb464d5d 存在未填写项目 2022-02-10 14:00:25 +08:00
caoqianming 173d9f8987 未填写项目更准确提示 2022-02-10 13:58:47 +08:00
caoqianming 6728ef10c4 后端权限代码完善 2022-02-10 13:53:03 +08:00
caoqianming 035982a3d1 usedstep need test serializer 2022-02-10 10:33:35 +08:00
caoqianming 11b22149c5 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-10 09:42:16 +08:00
caoqianming 28814649f6 其他入库serializer bug 2022-02-10 09:41:57 +08:00
shijing 37b874036f Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-02-10 09:24:34 +08:00
shijing fd1115cd36 subProcessCheckChange 2022-02-10 09:24:22 +08:00
caoqianming e086bcda58 出入库记录表增加其他入库 2022-02-10 09:18:25 +08:00
caoqianming 7528f49709 采购订单入库 2022-02-10 09:16:09 +08:00
shilixia efdc534a02 caihgudingdan 2022-02-10 09:03:44 +08:00
shilixia 6e90fad047 caigoujilu 2022-02-10 09:00:54 +08:00
caoqianming fadd16eb1f 工序中检验最后一步时设为未提交 2022-01-29 15:53:24 +08:00