Commit Graph

848 Commits

Author SHA1 Message Date
caoqianming 8dcabaf8dc wproduct notok筛选 2022-01-19 14:37:13 +08:00
caoqianming b8824e94ac 创建操作时同步设备状态 2022-01-18 08:42:26 +08:00
caoqianming e5bef0f5ef Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-17 14:39:44 +08:00
caoqianming 0a83b8c2c2 首页交付产品数查询 2022-01-17 14:39:37 +08:00
shijing 9a31871839 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-17 14:16:44 +08:00
shijing e07b5a4c5d somewarnfixandtestshow 2022-01-17 14:16:37 +08:00
shilixia e13ae7ff9b Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-17 14:13:34 +08:00
shilixia a14dac9bda tijiao 2022-01-17 14:13:28 +08:00
caoqianming ce62354c8f plan增加material查询条件 2022-01-17 14:12:26 +08:00
caoqianming 9b8518118a order plan filter增加material查询条件 2022-01-17 13:59:42 +08:00
caoqianming f1482c2a7f Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-17 13:32:42 +08:00
caoqianming 2bdc68f923 fifo 删除 bug 2022-01-17 13:32:34 +08:00
shilixia 1c62a21a56 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-17 13:22:05 +08:00
shilixia f24cfcb9ea xiugai 2022-01-17 13:21:59 +08:00
shijing ce4bbd0896 bugfix 2022-01-17 10:32:17 +08:00
shijing a98de8720a bugfix 2022-01-17 10:30:24 +08:00
shijing db83e0224e bugfix 2022-01-17 10:26:24 +08:00
caoqianming e2a9d3b048 fifoitem serializer 增加files_字段 2022-01-17 10:12:59 +08:00
caoqianming 330b20591a Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-17 10:06:32 +08:00
caoqianming b373262d40 testrecord serializer 增加draw_template字段 2022-01-17 10:06:25 +08:00
shilixia 371ee6ecf4 xiugai 2022-01-17 09:04:51 +08:00
shilixia aa76888a57 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-14 16:46:11 +08:00
shilixia b7b32b2320 xiugai 2022-01-14 16:46:04 +08:00
caoqianming 4257741c2d 采购记录need_test接口 2022-01-14 16:34:20 +08:00
caoqianming 75ff28535a 出入库增加need_test字段 2022-01-14 15:51:35 +08:00
caoqianming 490440cad3 同步数据库 2022-01-14 15:32:41 +08:00
caoqianming 62bd7423db 采购入库不需要填写入库时间 2022-01-14 15:28:04 +08:00
caoqianming 783a778d71 操作时设备状态返回 2022-01-14 15:19:22 +08:00
caoqianming 09a3581dca 批量入库remark非必填 2022-01-14 15:15:40 +08:00
caoqianming ef007e728a 批量入库remark非必填 2022-01-14 15:12:48 +08:00
shijing 43a936b7d9 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-14 08:36:48 +08:00
shijing c1ddf3ce30 required 2022-01-14 08:36:40 +08:00
caoqianming 3d0a0a5c2f 增加夹层检验 2022-01-13 17:03:02 +08:00
caoqianming a943c10fa1 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-13 16:57:26 +08:00
caoqianming 39986927d4 入库备注可不要 2022-01-13 16:57:18 +08:00
shijing c3b3f52196 clear 2022-01-13 16:50:33 +08:00
shijing 42659b9b85 changes 2022-01-13 16:48:20 +08:00
shijing ddfe733664 changes 2022-01-13 16:42:26 +08:00
caoqianming eb4cdf5d2b 修改bug 2022-01-13 16:21:27 +08:00
caoqianming 6ff8b117c0 更新bug 2022-01-13 16:15:30 +08:00
caoqianming 88aa3bf2be Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-13 16:12:15 +08:00
caoqianming a52d9e2b9c 判断消耗产出不一致 2022-01-13 16:12:07 +08:00
shilixia e7cb82e562 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-13 16:11:25 +08:00
shilixia 36c1158691 xiugai 2022-01-13 16:11:19 +08:00
caoqianming a6591c341c operation list count_work 字段 2022-01-13 16:08:11 +08:00
caoqianming 8a162fbe58 消耗产出校验bug 2022-01-13 16:06:22 +08:00
caoqianming 95f444ce83 count_work bug 2022-01-13 16:03:32 +08:00
caoqianming b4e5937b28 消耗与产出校验 主要是冷加工 2022-01-13 16:00:20 +08:00
caoqianming bae9d3be2f 同步数据库 2022-01-13 15:35:41 +08:00
caoqianming eac13fec8f 操作半成品增加摆放位置字段 2022-01-13 15:33:28 +08:00