zcdsj
/
hberp
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
848 Commits 3 Branches 0 Tags 30 MiB
Commit Graph

522 Commits

Author SHA1 Message Date
caoqianming 206df9c85c 出入库记录审核人 2021-11-11 09:44:02 +08:00
caoqianming 487c8fac28 出入库详情带仓库 2021-11-11 09:22:15 +08:00
caoqianming ae44db98bd 批次号可为空 2021-11-10 14:33:52 +08:00
caoqianming 77afc760ae 领料批次默认为空 2021-11-10 10:03:52 +08:00
caoqianming 01eaa2fe9f 领料时批次非必填项 2021-11-10 09:28:36 +08:00
caoqianming 5d5a1e7604 增加事务操作 2021-11-10 09:00:35 +08:00
caoqianming 537fda2e86 wpm post bug 2021-11-09 16:18:34 +08:00
caoqianming 0f229df8f0 wpm post bug 2021-11-09 15:39:42 +08:00
caoqianming 5beb5026ff wpm post bug 2021-11-09 15:37:50 +08:00
caoqianming 48caae5c9a wpm post bug 2021-11-09 13:49:56 +08:00
caoqianming a28282e331 wpm post bug 2021-11-09 13:20:07 +08:00
caoqianming 6a4c99f18c 领料bug 2021-11-09 11:46:27 +08:00
caoqianming 2b3f45eb7f 修改表名 2021-11-09 00:14:30 +08:00
caoqianming b083f1cd8d wpminit serializer 2021-11-08 14:47:06 +08:00
caoqianming 0bdd8a78a1 修改qm表字段 2021-11-08 13:06:01 +08:00
caoqianming 69fe697988 修改qm bug 2021-11-08 11:28:29 +08:00
caoqianming 229ab9b34a 修改qm bug 2021-11-08 11:25:30 +08:00
caoqianming 3664971a17 修改qm bug 2021-11-08 11:12:33 +08:00
caoqianming 2e9924f1d5 修改qm bug 2021-11-08 11:09:17 +08:00
caoqianming 0158998ef9 修改qm 2021-11-08 11:02:54 +08:00
caoqianming 5357a2d82a 修改表名 2021-11-08 09:53:16 +08:00
caoqianming 950418a154 修改表名 2021-11-08 09:35:53 +08:00
caoqianming b966714f7b action form init 组装form 2021-11-08 09:27:10 +08:00
caoqianming c5aafb79e0 bug修复 2021-11-08 09:05:03 +08:00
caoqianming 9588562390 生产操作提交 2021-11-08 09:03:15 +08:00
caoqianming 1b7190a4b6 调用表单操作 2021-11-04 16:14:48 +08:00
caoqianming ba9466a90b 生成子计划bug 2021-11-04 10:07:41 +08:00
caoqianming 29a0a0d33a 车间物料表修改对应子计划 2021-11-04 09:16:12 +08:00
caoqianming b6dca27688 wmateriallist 2021-11-03 08:49:32 +08:00
caoqianming b47b2017de 页面调整 2021-11-03 08:19:51 +08:00
caoqianming c49bb54868 修改表名 2021-11-02 17:08:36 +08:00
caoqianming f8676bc6ad 清理相关数据 2021-11-02 16:50:20 +08:00
caoqianming b47c69f0de 领料接口bug 2021-11-02 16:29:13 +08:00
caoqianming 6383f37422 领料接口bug 2021-11-02 16:24:08 +08:00
caoqianming 0f38d31883 入厂检查 2021-11-02 15:51:22 +08:00
caoqianming 1bec31257e 入库出库审核 2021-11-02 11:11:22 +08:00
caoqianming 1fa86988f1 物料批次号 2021-11-02 09:49:08 +08:00
caoqianming e007885ccf 工具工装增加put接口 2021-11-01 15:27:07 +08:00
caoqianming d655e78625 增加工具工装接口 2021-11-01 15:23:37 +08:00
caoqianming bad2e501f7 增加物料单位 2021-11-01 09:37:46 +08:00
caoqianming 996cfe5b5d 领料需求接口 2021-11-01 09:01:17 +08:00
caoqianming d832878c50 领料需求接口 2021-11-01 08:57:06 +08:00
caoqianming 74c787960e 出入库更新中间表bug 2021-10-29 15:06:10 +08:00
caoqianming 10e0aa6706 fifo detail 2021-10-29 10:34:00 +08:00
caoqianming 3f884b74d1 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-10-29 10:27:06 +08:00
caoqianming 1e361b5a6a 采购入库bug,领料需求 2021-10-29 10:26:56 +08:00
caoqianming 7b066bd0c6 出入库记录详情表 2021-10-28 16:23:18 +08:00
caoqianming 2a79fa9f2b 出入库记录详情表 2021-10-28 16:04:15 +08:00
caoqianming 396050be25 增加查询条件 2021-10-28 15:44:02 +08:00
caoqianming 4ac2698ba5 出入库记录列表 2021-10-28 15:40:26 +08:00
caoqianming 4453b4789f inventory bug 2021-10-28 15:19:55 +08:00
caoqianming 1d7faaa34e 采购入库bug 2021-10-28 15:16:11 +08:00
caoqianming f7df60e7b5 采购入库bug 2021-10-28 13:50:06 +08:00
caoqianming c40dfa7647 采购入库bug 2021-10-28 13:47:36 +08:00
caoqianming b6d97a1be1 采购入库bug 2021-10-28 13:44:57 +08:00
caoqianming 1ab3b4eb7a 采购入库bug 2021-10-28 13:44:29 +08:00
caoqianming 2999ebb5f0 采购入库bug 2021-10-28 13:41:42 +08:00
caoqianming c33418f7f5 采购入库bug 2021-10-28 13:35:15 +08:00
caoqianming 189e9de67f inventory bug 2021-10-28 10:36:30 +08:00
caoqianming 616ebdac4e 采购入库信号 2021-10-28 09:46:26 +08:00
caoqianming 3bd4cb014e 增加采购入库功能 2021-10-27 13:17:01 +08:00
caoqianming ee09543227 getParticipant bug 2021-10-25 13:21:26 +08:00
caoqianming ac879dd74e 抄送bug 2021-10-25 13:17:40 +08:00
caoqianming 2931b1322e inm product表 2021-10-25 13:11:44 +08:00
caoqianming 677bf4853b 角色过滤策略bug 2021-10-25 13:08:21 +08:00
caoqianming 7eaabfc3b9 更改背景色 2021-10-25 09:17:41 +08:00
caoqianming 2c82f8aa64 角色筛选策略以及抄送功能 2021-10-25 08:32:55 +08:00
caoqianming 927f25ae05 wf增加参数bug 2021-10-22 15:35:48 +08:00
caoqianming 145bf1d6b7 代码获取处理人 2021-10-22 14:36:20 +08:00
caoqianming deb278085d 增加is_main 2021-10-21 15:58:43 +08:00
caoqianming b40efc3ca6 主产出只能有1个 2021-10-21 15:56:45 +08:00
caoqianming b5497a6b75 工作流角色多选 2021-10-21 11:32:21 +08:00
caoqianming 5ae9a08425 工作流角色选人过滤策略 2021-10-21 11:01:23 +08:00
caoqianming 29612764ae eval 安全性处理 2021-10-21 08:55:07 +08:00
caoqianming c63a636efe 条件流转bug 2021-10-20 14:50:49 +08:00
caoqianming 70f71874e7 条件流转bug 2021-10-20 14:41:01 +08:00
caoqianming 526127b1e4 工单聚合查询bug 2021-10-20 14:38:00 +08:00
caoqianming c5fc214c10 eval函数调整 2021-10-20 11:12:21 +08:00
caoqianming 5046f4dbb1 设备状态计算去重 2021-10-20 09:24:06 +08:00
caoqianming 0b5c837fe5 表达式流转安全构建 2021-10-20 08:16:29 +08:00
caoqianming 6ecc0f6e57 工单待办聚合查询 2021-10-19 11:18:32 +08:00
caoqianming 1f21df79e5 子进度接口bug 2021-10-19 10:26:29 +08:00
caoqianming ac8bf48a91 子进度进度接口bug 2021-10-19 09:59:55 +08:00
caoqianming da1bb4e320 子计划进度接口 2021-10-19 09:54:45 +08:00
caoqianming 1d056a775f 增加子生产进度表 2021-10-19 09:46:44 +08:00
caoqianming 7b6f5008ce 人脸识别精度调整 2021-10-18 14:46:05 +08:00
caoqianming 7509ff0e15 人脸识别基本完成 2021-10-18 14:18:11 +08:00
caoqianming 7dc91b5a86 判定规则 2021-10-18 11:00:38 +08:00
caoqianming 5ac4ef9985 工单批量物理删除 2021-10-15 14:09:17 +08:00
caoqianming 2a3b7424b3 我处理的bug 需要去重 2021-10-15 13:57:30 +08:00
caoqianming ce43a37c04 加签完成bug 2021-10-15 13:47:22 +08:00
caoqianming fbee94806b 生成子计划工序步骤 2021-10-15 10:36:46 +08:00
caoqianming c6481027bf 加签接口 2021-10-15 10:17:18 +08:00
caoqianming 71fd3e3892 修改bug 2021-10-15 09:14:01 +08:00
caoqianming 0b58bf7b2a 子生产计划按大工序排序 2021-10-15 09:09:55 +08:00
caoqianming d4ecdfb192 生产子计划接口修改 2021-10-14 15:43:58 +08:00
caoqianming 6d804b164c 生产子计划接口地址 2021-10-14 15:40:26 +08:00
caoqianming 85b21dcbac 生成子计划序列化 2021-10-14 15:34:16 +08:00
caoqianming 45d4727c15 生成生产子计划 2021-10-14 15:10:59 +08:00
caoqianming 3aac6ed8b0 隶属大工序 2021-10-14 09:47:30 +08:00
caoqianming 465b33b0d0 生产分解隶属工序字段 2021-10-14 09:39:57 +08:00
caoqianming f6dab8e2f3 加签完成接口 2021-10-14 09:16:00 +08:00
caoqianming a8a8b2431a 加签接口 2021-10-14 09:03:18 +08:00
caoqianming 59551664db 工单退回状态处理 2021-10-14 09:00:21 +08:00
caoqianming 961754d8ca 加签操作 2021-10-13 15:41:01 +08:00
caoqianming ecd4192109 查看设备状态接口 2021-10-13 15:18:48 +08:00
caoqianming 9d2f2bea6c 工单关闭bug 2021-10-13 14:42:24 +08:00
caoqianming 660ef8ec11 工单关闭接口bug 2021-10-13 14:26:09 +08:00
caoqianming 4913162ff8 物料消耗计算 2021-10-13 13:22:26 +08:00
caoqianming 243613bfdf 关闭工单接口 2021-10-13 11:22:46 +08:00
caoqianming 0e76ffe6b3 物料消耗接口修改 2021-10-13 10:42:35 +08:00
caoqianming 5bae28fba6 物料消耗计算 2021-10-13 10:39:31 +08:00
caoqianming 3f959c6e2d mtm usedstep remark字段 2021-10-13 09:23:03 +08:00
caoqianming a30cab1c94 工艺流程物料detail接口合并 2021-10-13 09:04:52 +08:00
caoqianming 52df9ddec5 生产分解表结构 2021-10-13 08:58:41 +08:00
caoqianming 84a78f0470 撤回原因 2021-10-13 08:49:48 +08:00
caoqianming 2eabbf891e 子工序返回完整list 2021-10-12 17:04:07 +08:00
caoqianming 4bab6de73d 修改产品分解表结构 2021-10-12 16:58:32 +08:00
caoqianming a535c1dc50 接单操作bug 2021-10-12 16:42:11 +08:00
caoqianming 252687be47 撤单接口 2021-10-12 16:29:15 +08:00
caoqianming 39e69ce170 工单列表增加create_by字段 2021-10-12 16:01:37 +08:00
caoqianming 98a07bb27a 增加工单列表接口状态允许撤回字段 2021-10-12 15:59:10 +08:00
caoqianming bbf5b2cbc9 查看产品大工序bug 2021-10-12 13:00:49 +08:00
caoqianming 38e7cf2ee2 查看产品详情bug 2021-10-12 11:32:13 +08:00
caoqianming 9b198bce6c 物料列表接口 2021-10-12 10:49:39 +08:00
caoqianming 1e7ebd672a 产品生产分解 2021-10-12 10:45:14 +08:00
caoqianming bbba12ed6c 工单流转记录 2021-10-11 14:01:47 +08:00
caoqianming e1ddd7f9e7 flowsteps接口bug 2021-10-11 13:44:33 +08:00
caoqianming b7a701efe6 条件流转bug 2021-10-11 10:04:39 +08:00
caoqianming c3cb7e36dc 订单生成计划bug-产品字段 2021-10-08 17:00:30 +08:00
caoqianming ccabd5a701 订单生成排产计划 2021-10-08 16:31:11 +08:00
caoqianming 33efd80d99 待排订单接口 2021-10-08 15:33:47 +08:00
caoqianming ce48b8e97c 待排订单接口 2021-10-08 15:32:06 +08:00
caoqianming 36924b43ad 接单之后的bug 2021-09-30 16:54:23 +08:00
caoqianming 33db917a06 接单bug 2021-09-30 16:40:00 +08:00
caoqianming 016f316641 条件流转 2021-09-30 16:22:11 +08:00
caoqianming 050d4e5bda 增加条件流转 2021-09-30 16:09:39 +08:00
caoqianming bb53fbe220 创建和更新时间 2021-09-30 10:03:15 +08:00
caoqianming 8a43ad7ee7 ticket 查询分类all 2021-09-30 09:57:06 +08:00
caoqianming cc8c409f19 指定查询分类 2021-09-30 09:32:58 +08:00
caoqianming 89d5eb0686 inventory serializer 2021-09-29 11:40:31 +08:00
caoqianming 207ef13494 返回ticket data列表 2021-09-29 10:17:42 +08:00
caoqianming 4ff3a46c59 同步em数据库 2021-09-29 08:46:32 +08:00
shilixia 611736c4c6 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-28 17:03:24 +08:00
shilixia d2f6cf1b04 tijiao 2021-09-28 17:03:18 +08:00
caoqianming 2bc04c13c4 workflow state添加type serializer 2021-09-28 16:56:39 +08:00
caoqianming 71502088c9 设备增加关联工序的serializer 2021-09-28 15:24:38 +08:00
caoqianming 68e4164fe0 记录表格serializer增加material 2021-09-28 14:31:45 +08:00
shilixia b963b53140 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-28 14:01:37 +08:00
shilixia 768d6156b7 xial 2021-09-28 14:01:30 +08:00
caoqianming 8556c7149d 记录表格增加物料字段 2021-09-28 13:57:50 +08:00
caoqianming 5b47ea14f3 选多人处理service 2021-09-23 08:53:31 +08:00
caoqianming 9ed53b3df0 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-22 14:45:52 +08:00
caoqianming 81aede9497 工作流handle serialize 2021-09-22 14:45:43 +08:00
shilixia cf5ab840b4 tijiao 2021-09-22 13:59:08 +08:00
shilixia aec826efc6 tijiaozigongxu 2021-09-22 13:58:32 +08:00
shilixia 1559fb95a4 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-22 10:05:08 +08:00
shilixia 1ca3522153 xiugai 2021-09-22 10:05:02 +08:00
caoqianming da65c59893 修改文件夹名称 2021-09-22 09:08:23 +08:00
shilixia 92823553cb wuliao 2021-09-17 09:06:50 +08:00
shilixia 64c4a4884e wuliao 2021-09-16 16:32:05 +08:00
shilixia c9f448616b dingdan 2021-09-16 15:36:13 +08:00
caoqianming c27a77bac9 增加标准和检测项目表 2021-09-15 23:36:06 +08:00
shilixia 36478034fd shebeihetong 2021-09-15 13:39:15 +08:00
shilixia 461f3bd2ce jiaozhunjianding 2021-09-14 16:52:27 +08:00
shilixia cb2beb1d3e shebei 2021-09-14 14:56:17 +08:00
shilixia 05095bd774 tijiso 2021-09-14 11:21:06 +08:00
shilixia 5db16f4fc2 shebei 2021-09-14 09:02:14 +08:00
shilixia 368b9f9c12 hetong,xiugai 2021-09-13 16:08:15 +08:00
shilixia 1b6c7c5e07 kehu 2021-09-13 09:48:18 +08:00
shilixia d918bb68db kehu 2021-09-13 09:45:52 +08:00
caoqianming 7eda1cc7a5 处理冲突 2021-09-10 14:24:00 +08:00
caoqianming 378e833090 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-10 14:23:30 +08:00
caoqianming 54a51f3a2c 处理冲突 2021-09-10 14:23:24 +08:00
caoqianming 9c8b7212b5 增加订单view 2021-09-10 13:51:29 +08:00
caoqianming 8e9fede047 sammodel表 2021-09-09 14:39:35 +08:00
caoqianming 17789ed4a2 fix bug 2021-09-07 14:42:39 +08:00
caoqianming c5f0ff4a0f 技术文档列表接口 2021-09-07 14:39:17 +08:00
caoqianming bf8a965586 人脸识别调整 2021-09-07 12:18:45 +08:00
caoqianming bc84a62366 mtm 表单设计必填去除 2021-09-07 11:18:55 +08:00
caoqianming 20a89f3d3f 增加技术文档接口 2021-09-06 17:04:19 +08:00
caoqianming 13dbd18efc 子工序列表返回设备信息 2021-09-06 09:12:43 +08:00
caoqianming 55a266808f 子工序列表增加设备信息 2021-09-06 09:07:55 +08:00
caoqianming 6805669f47 修改工序排列方式 2021-09-06 08:53:26 +08:00
caoqianming ed4f99eea7 提交数据库 2021-09-02 16:23:09 +08:00
caoqianming 177699fb41 仓库信息增删改查接口 2021-09-02 16:20:15 +08:00
caoqianming 24d64a9e17 formfield 读取接口 2021-09-02 13:39:02 +08:00
caoqianming 32459d8710 增加记录表格表 2021-09-01 14:47:10 +08:00
caoqianming cc9006b695 fix bug 2021-08-31 16:49:14 +08:00
caoqianming 9d294799f1 子工序详情增加设备信息 2021-08-31 16:47:36 +08:00
caoqianming 5458fef0d4 工序表增加workshop字段 2021-08-31 16:10:47 +08:00
caoqianming 818d3dfe41 同步数据库，优化response 2021-08-31 14:47:49 +08:00
caoqianming 2a220e962e 产品生产子工序表 2021-08-31 14:26:15 +08:00
caoqianming 107891ad6d 修改输入输出物料计数字段 2021-08-30 13:31:39 +08:00
caoqianming 615e84e04a fix conflict 2021-08-30 13:17:49 +08:00
caoqianming c66581adbb 输入输出物料接口 2021-08-30 13:14:32 +08:00
caoqianming 49211ba971 输入输出物料接口 2021-08-30 11:30:38 +08:00
caoqianming 03f88f89c1 增加swagger.json 2021-08-30 09:57:51 +08:00
caoqianming d85f52454c 工作流创建清单 2021-08-27 17:17:38 +08:00
caoqianming ff47f66463 工艺流程存json 2021-08-27 16:20:26 +08:00
caoqianming 56693718c4 产品生产工艺不分页 2021-08-27 08:52:56 +08:00
caoqianming dbf4560423 工作流新建工单中 2021-08-26 17:08:45 +08:00
caoqianming 70b1305bb7 产品生产工艺流程增加删除 2021-08-26 14:01:59 +08:00
caoqianming faf524604b mtm step list 2021-08-26 13:15:28 +08:00
caoqianming cd37d53459 工序返回指导书嵌套字段 2021-08-26 10:04:49 +08:00
caoqianming 4bdf6382d5 制造技术管理表 2021-08-25 10:42:49 +08:00
caoqianming c97045112a state simple 序列化 2021-08-20 10:29:11 +08:00
caoqianming 21463c1ba2 trans filter bug 2021-08-19 16:11:18 +08:00
caoqianming 639cd4190a 修改字段类型 2021-08-19 11:06:30 +08:00
caoqianming f4158cf681 自定义字段修改 2021-08-19 09:56:59 +08:00
caoqianming 172f7bae6c 删除接口新增 2021-08-18 14:25:39 +08:00
caoqianming 11f0e69752 字段和流转 2021-08-18 08:58:37 +08:00
caoqianming 331c3ce602 工作流节点视图 2021-08-17 16:29:31 +08:00
caoqianming fb776d2272 同步wf表 2021-08-17 13:54:39 +08:00
caoqianming e040b14860 日志查询 2021-08-17 09:47:14 +08:00
caoqianming eda2c23659 增加workflow 2021-08-16 17:25:40 +08:00
caoqianming 015f3d5537 同时创建employee 2021-08-16 10:34:36 +08:00
caoqianming 2fe614d45c 增加hrm 2021-08-16 09:14:59 +08:00
shilixia 63320da683 shebeigongyingshang 2021-08-13 08:55:09 +08:00
caoqianming 58a71b447e 增加设备台账接口和供应商接口 2021-08-12 10:18:24 +08:00
shilixia ffc0a36c63 基础表建立 2021-08-11 08:55:37 +08:00
caoqianming c5aa2a9bd6 first commit 2021-08-10 09:59:04 +08:00