Commit Graph

  • 6a8a9c6e40 rev:个人信息修改 liuxy 2023-08-15 21:07:21 +08:00
  • 02d39afbd5 add:新增包装标签打印 zhangzhiqiang 2023-08-15 20:03:57 +08:00
  • aa54150593 add:三线包装工单 zhangzhiqiang 2023-08-15 19:12:40 +08:00
  • 4bbaa58d36 rev:更新箱记录表 liuxy 2023-08-15 14:23:30 +08:00
  • 60058e963f rev:1.海柔半成品acs与mes接口 2.半成品、成品库存增加单据类型字段 liuxy 2023-08-11 18:56:01 +08:00
  • ac23052354 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-08-11 17:14:54 +08:00
  • 7824c459be rev:刻字上料半成品库存过滤 zhangzhiqiang 2023-08-11 17:14:47 +08:00
  • 29f251f7d9 rev 更新底层写入信号逻辑 USER-20220102CG\noblelift 2023-08-11 16:49:55 +08:00
  • b345ea5757 rev:刻字上料输送线任务顺序 zhangzhiqiang 2023-08-11 16:36:16 +08:00
  • 77795095ba add:成品出库分配页面新增一键设置功能 liuxy 2023-08-10 19:13:06 +08:00
  • ef78cef7d8 rev:导入销售单生成id liuxy 2023-08-10 16:36:14 +08:00
  • 379cfc7179 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one liuxy 2023-08-10 16:35:30 +08:00
  • c433ccde33 rev:导入销售单生成id liuxy 2023-08-10 16:35:12 +08:00
  • dc5031c9fa Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-08-10 16:35:07 +08:00
  • 57e6bebda1 add:添加刻字回流 zhangzhiqiang 2023-08-10 16:35:02 +08:00
  • 81606c082c rev:仓位模糊查询修改、组盘记录:过滤掉相同订单、托盘的组盘记录 liuxy 2023-08-10 15:04:59 +08:00
  • bcbe605342 修改:临时包装区上料 zhangzhiqiang 2023-08-10 14:45:45 +08:00
  • 93fa9f818f rev:成品出库分配设置站点需改为 生成任务和下发任务一起 liuxy 2023-08-10 10:45:47 +08:00
  • 59f002b063 rev:清洗机上料任务 zhangzhiqiang 2023-08-09 22:20:00 +08:00
  • 192561edfe add:一体机包装机叫料功能 zhangzhiqiang 2023-08-09 15:47:37 +08:00
  • ef17d390f7 add:组盘修改删除/包装机新增字段 zhangzhiqiang 2023-08-08 22:06:19 +08:00
  • fdf577f540 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-08-08 10:23:57 +08:00
  • bdd1aa57cc add:组盘导入临时新增销售订单 zhangzhiqiang 2023-08-08 10:23:52 +08:00
  • 28a203ca3d add:盘点出库 liuxy 2023-08-07 15:00:38 +08:00
  • 3ace18354f rev:成品入库批量归入 zhangzhiqiang 2023-08-07 09:01:32 +08:00
  • a1b892ff1b add:PC海柔半成品盘点 liuxy 2023-08-04 17:33:33 +08:00
  • 172ec8692c add:添加一体机批量入库/组盘 zhangzhiqiang 2023-08-04 14:23:32 +08:00
  • 99813b0410 add:pc海柔半成品出库 liuxy 2023-08-03 10:30:49 +08:00
  • 5f9f4ba30c rev 优化舞台监控 USER-20220102CG\noblelift 2023-08-01 22:52:57 +08:00
  • 2938cb17a4 add:海柔半成品入库、海柔半成品库存、海柔半成品库存变动 liuxy 2023-08-01 17:56:53 +08:00
  • fad2c8289f add:刻字工序 zhangzhiqiang 2023-07-31 18:15:48 +08:00
  • e02421418c rev:成品出库设置站点修改 zhangzhiqiang 2023-07-27 20:35:36 +08:00
  • ed000b6f56 rev: 成品出库:新增出库单时将同一货位上的所有物料带出、设置任务时同一货位的任务不在生成、发货单状态修改 liuxy 2023-07-27 17:00:57 +08:00
  • bd5ae21530 rev:储料仓重量上线修改 zhangzhiqiang 2023-07-27 15:33:37 +08:00
  • e73877620a add:仓位物料设置 zhangzhiqiang 2023-07-27 15:21:42 +08:00
  • b2d2cda72b Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-07-27 11:22:30 +08:00
  • 4edcab8b9e rev:出库修改 zhangzhiqiang 2023-07-27 11:22:23 +08:00
  • 5de4864ecc Merge branch 'master' of http://121.40.234.130:8899/root/hl_one USER-20220102CG\noblelift 2023-07-26 11:29:18 +08:00
  • 2aedcf50fd rev opc同步线程 USER-20220102CG\noblelift 2023-07-26 11:29:05 +08:00
  • e60c8a8c0f rev:删除无用引用 zhangzhiqiang 2023-07-25 18:46:04 +08:00
  • de81709cb6 rev:手持成品入库单据列表改分页 zhangzhiqiang 2023-07-25 18:44:06 +08:00
  • 373488ada2 add:新增半成品出入库导入/清洗刻字调度任务 zhangzhiqiang 2023-07-25 17:08:37 +08:00
  • cc2cf779e9 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-07-25 17:02:22 +08:00
  • 3b02e7bc1c fix :清洗上料,下料 jiaoliming 2023-07-25 11:03:20 +08:00
  • 240d5aa8b4 fix : 修改刻字上料输送线逻辑 jiaoliming 2023-07-22 11:53:32 +08:00
  • 76d42e71fc rev:维护销售订单、工艺路线、产品工艺路线功能 zhouz 2023-07-21 17:24:01 +08:00
  • d43b0ba9eb rev:修改bom单明细表增加aps相关字段。 baoge 2023-07-20 16:10:16 +08:00
  • 7e7bbe64ba add:增加aps的Bom数据相关功能;rev:修改一些uuid改为id,optid,optName改为id,name; baoge 2023-07-20 15:03:45 +08:00
  • 415b980c51 add : 清洗后段 jiaoliming 2023-07-19 18:15:12 +08:00
  • 47c6039853 rev:工单编号字典 zhangzhiqiang 2023-07-19 14:38:34 +08:00
  • 98ef6cf4d4 add:清洗代码 zhangzhiqiang 2023-07-19 13:42:04 +08:00
  • 2038cf1fe4 Merge remote-tracking branch 'origin/master' baoge 2023-07-17 16:33:31 +08:00
  • dbf1cc2e1d add:aps_sale_type,对应aps订单类型。 baoge 2023-07-17 16:33:10 +08:00
  • 4a0a36c091 rev:根据实际排产场景,修改销售订单内容 baoge 2023-07-17 16:29:29 +08:00
  • 76ff2a41ec Merge branch 'master' of http://121.40.234.130:8899/root/hl_one zhouz 2023-07-17 15:35:42 +08:00
  • ffe29d6d4d rev:新增导入相关功能 zhouz 2023-07-17 11:28:11 +08:00
  • a020439a97 rev:修正物料信息为空的情况。 baoge 2023-07-11 10:26:59 +08:00
  • 35f70da133 rev:刻字包装调度代码/半成品入库数量改重量 zhangzhiqiang 2023-07-11 09:26:57 +08:00
  • 7ea3d22904 rev:aps订单强制完成,生成工单编号。 baoge 2023-07-10 21:54:20 +08:00
  • 586436419b rev:结构变更 zhangzhiqiang 2023-07-09 10:21:13 +08:00
  • a37aaf90f3 rev:销售单同步/结构变动 zhangzhiqiang 2023-07-08 09:26:06 +08:00
  • 974a14a63e rev:刻字包装任务/工序/工单merge zhangzhiqiang 2023-07-06 18:21:54 +08:00
  • 8fb06c033c Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-07-06 18:17:12 +08:00
  • 250592eacd rev:成品入库一体机 liuxy 2023-07-06 17:14:44 +08:00
  • 4949856067 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-07-06 16:55:48 +08:00
  • 3d1b6119e1 add:刻字机取放货判断工作模式 gengby 2023-07-06 16:31:42 +08:00
  • 5d7c70570d opt:优化工厂日历创建失败时回滚操作。 baoge 2023-07-06 15:35:33 +08:00
  • ebe6d6f027 rev:一体机修改重量为g liuxy 2023-07-06 14:49:41 +08:00
  • 39e9afae00 海亮海柔接口 周俊杰 2023-07-06 14:36:03 +08:00
  • 4dbb96f852 fix:升级版本,修复低版本fastjson反序列化错误 baoge 2023-07-05 18:57:11 +08:00
  • fcea673861 更新 index.vue baoge 2023-07-05 16:09:07 +08:00
  • e233f01bec add:排产相关功能。 rev:修改工单管理,销售订单管理,工厂日历功能; baoge 2023-07-05 16:00:55 +08:00
  • cc5d6be4da rev:成品入库一体机 liuxy 2023-07-05 15:04:19 +08:00
  • bdbd97a7bc rev:半成品盘点一体机 liuxy 2023-07-05 11:20:54 +08:00
  • 1870c02e50 add:刻字称重 gengby 2023-07-05 11:04:04 +08:00
  • d7104beb88 add : 合框称重 jiaoliming 2023-07-04 20:50:31 +08:00
  • ea3b8caabc fix:移除UnboxingOrderDto jiaoliming 2023-07-04 19:18:00 +08:00
  • bbc2b8b1c6 Revert "no message" jiaoliming 2023-07-04 19:11:45 +08:00
  • 337b1a0cdd no message jiaoliming 2023-07-04 19:06:55 +08:00
  • a27e76a7bd add:清洗刻字包装 jiaoliming 2023-07-04 19:00:33 +08:00
  • 418fc4b966 rev:刻字包装服务 zhangzhiqiang 2023-07-04 08:47:09 +08:00
  • ca68079d6f rev:一体机半成品入库,半成品出库 liuxy 2023-07-03 16:33:04 +08:00
  • 128272a27d rev:刻字后端代码 zhangzhiqiang 2023-07-03 14:28:32 +08:00
  • ec0fd6cd53 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one zhouz 2023-07-03 08:58:41 +08:00
  • 3603386c81 rev:优化BUG zhouz 2023-07-03 08:58:31 +08:00
  • 3b4485f945 rev: 界面样式修改 ludj 2023-06-30 15:57:32 +08:00
  • 6bf6e23d0b rev:半成品出库、半成品入库、半成品盘点、半成品拼盘、成品入库一体机 liuxy 2023-06-30 15:37:00 +08:00
  • f37b0afe88 rev:新增原料需求功能 zhouz 2023-06-30 10:23:26 +08:00
  • beecba8215 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one zhouz 2023-06-29 18:35:50 +08:00
  • 7b360a1743 rev:新增原材料需求功能 zhouz 2023-06-29 18:35:44 +08:00
  • eda806b86f add:一体机 liuxy 2023-06-28 17:11:11 +08:00
  • 9106862f43 rev:界面布局优化 ludj 2023-06-28 11:06:23 +08:00
  • 2d2d3d3c74 rev:基础数据用额面维护 zhangzhiqiang 2023-06-28 09:17:26 +08:00
  • 3fb718b739 rev 缓存线出库数量 gengby 2023-06-28 08:49:59 +08:00
  • 831acb3051 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one zhouz 2023-06-27 18:34:48 +08:00
  • 6ec8ac17ab rev:原材料功能优化 zhouz 2023-06-27 18:34:42 +08:00
  • c75f83cb0c add: 一体机成品入库 liuxy 2023-06-27 16:48:40 +08:00
  • b49adc53e6 rev:半成品拼盘 liuxy 2023-06-27 14:10:12 +08:00
  • afec6749f7 rev 监控页面异常信息显示 gengby 2023-06-27 13:56:10 +08:00
  • c09c3c926e rev:半成品拼盘 liuxy 2023-06-27 09:09:12 +08:00