leo
/
LAPP_LF_MOM_BACKEND
2
1
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity

Commit Graph

  • cb06ff3 (HEAD -> develop, feature_om) Merge pull request '调整产品追溯功能为生产监控 新增新的产品追溯功能' (#102) from feature_om into develop by 徐腾飞 2021-10-11 15:53:37 +0800
  • 788d62e (refs/pull/102/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om by zhangxin 2021-10-11 15:49:58 +0800
  • 93f46fa 调整产品追溯功能为生产监控 新增新的产品追溯功能 by zhangxin 2021-10-11 15:49:47 +0800
  • 7906433 Merge pull request '根据现场反馈完善创建工单和取消工单的功能' (#101) from feature_om into develop by 娄文智 2021-10-08 17:38:56 +0800
  • 56455a2 (refs/pull/101/head) 根据现场反馈完善创建工单和取消工单的功能 by zhangxin 2021-10-08 17:36:36 +0800
  • 4ac62c0 Merge pull request '添加26到80状态工单的取消功能' (#100) from feature_om into develop by weichenglei 2021-09-28 10:00:18 +0800
  • 8c989d0 (refs/pull/100/head) 派工生成打印模板的时候 先校验生成的流水号是不是已存在，存在则继续生成 by zhangxin 2021-09-28 09:59:04 +0800
  • bde0706 添加字段ObjectPO by zhangxin 2021-09-27 13:21:48 +0800
  • 8fcefe2 添加26到80状态工单的取消功能 by zhangxin 2021-09-27 13:21:32 +0800
  • ad3ed97 修改配置文件 by zhangxin 2021-09-27 13:19:40 +0800
  • 283c072 注释掉测试代码 by zhangxin 2021-09-27 13:19:25 +0800
  • 74c6ed4 Merge pull request '添加工单追溯功能代码' (#99) from feature_om into develop by weichenglei 2021-09-18 11:31:05 +0800
  • c822e91 (refs/pull/99/head) 修改字段赋值不上的bug by Xin.zhang@le-it.com.cn 2021-09-18 11:28:22 +0800
  • 8004416 添加工单追溯功能代码 by Xin.zhang@le-it.com.cn 2021-09-17 17:49:34 +0800
  • c07a49d Merge pull request '添加了新的自动生成代码' (#98) from feature_NewCode into develop by zhangxin 2021-09-16 14:36:29 +0800
  • 8f93c47 (refs/pull/98/head) 添加了新的自动生成代码 by allanwei 2021-09-16 14:31:56 +0800
  • 397a7a9 Merge pull request '添加了新的自动生成代码' (#97) from feature_NewCode into develop by zhangxin 2021-09-16 13:22:07 +0800
  • 4b87c41 (refs/pull/97/head) 添加了新的自动生成代码 by allanwei 2021-09-16 13:17:38 +0800
  • d39e2a7 Merge pull request '添加查单功能 添加问题项维护功能' (#96) from feature_om into develop by weichenglei 2021-09-14 10:53:28 +0800
  • e518b0e (refs/pull/96/head) 修复以服务启动的bug by zhangxin 2021-09-14 10:50:21 +0800
  • e8e20dd 添加新的工单工艺维护逻辑 by zhangxin 2021-09-14 10:50:04 +0800
  • 0e2b0d8 添加opc问题项配置维护功能 by zhangxin 2021-09-14 10:49:40 +0800
  • 007e282 添加常量 by zhangxin 2021-09-14 10:48:28 +0800
  • d2d2350 添加排序id by zhangxin 2021-09-14 10:47:28 +0800
  • 288a282 调整读取配置文件代码 by zhangxin 2021-09-14 10:42:46 +0800
  • 619a3fe Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om by zhangxin 2021-09-09 11:15:42 +0800
  • 81eb495 Merge pull request '添加了新的自动生成代码' (#95) from feature_NewCode into develop by zhangxin 2021-09-09 11:15:10 +0800
  • 9a11ea6 (refs/pull/95/head) 添加了新的自动生成代码 by allanwei 2021-09-09 11:05:06 +0800
  • 5b95e40 添加订单切割 订单排序的功能 by zhangxin 2021-09-07 18:34:02 +0800
  • 5fcf713 添加查询所有未派工work order的方法 by zhangxin 2021-09-07 18:33:18 +0800
  • 613c3c7 Merge pull request '调整创建批次工单生成工艺路径功能' (#94) from feature_om into develop by weichenglei 2021-09-07 14:27:24 +0800
  • 9fa5253 (refs/pull/94/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om by zhangxin 2021-09-07 14:25:52 +0800
  • adc81d7 添加字段sort 修改不再依赖单据打印的规则 新增工单拆分的接口 by zhangxin 2021-09-07 09:32:06 +0800
  • c4eee48 修改派工的PO只根据是否有depend on by zhangxin 2021-09-07 09:30:36 +0800
  • 3c68eda 添加保存接口 by zhangxin 2021-09-07 09:29:52 +0800
  • d893bf7 修改detail id为big int by zhangxin 2021-09-07 09:29:15 +0800
  • 8c9c87c 添加打印规则前端传入绑定结构体 by zhangxin 2021-09-07 09:28:51 +0800
  • fad9ec9 修复查询工艺时 拼接artId没有双引号的bug by zhangxin 2021-09-07 09:27:56 +0800
  • 4793a68 Merge pull request '根据现场场景调整生成工单及工艺逻辑' (#93) from feature_om into develop by 娄文智 2021-09-02 12:36:04 +0800
  • 516fcc0 (refs/pull/93/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om by zhangxin 2021-09-02 11:36:32 +0800
  • bf18861 Merge pull request '添加了新的自动生成代码' (#92) from feature_NewCode into develop by zhangxin 2021-09-02 11:34:26 +0800
  • 4ef8c43 (refs/pull/92/head) Merge branch 'develop' into feature_NewCode by weichenglei 2021-09-02 11:33:09 +0800
  • 730da41 Merge pull request '打印字段添加' (#91) from feature_printre into develop by zhangxin 2021-09-02 11:18:37 +0800
  • 018e41d (refs/pull/91/head, feature_printre) 打印字段添加 by louwenzhi 2021-09-02 11:17:09 +0800
  • 60b7b70 添加了新的自动生成代码 by allanwei 2021-09-02 11:08:27 +0800
  • b0e3efc 保存时 添加删除的筛选条件workplacenr by zhangxin 2021-09-02 10:50:29 +0800
  • dd8955f 调整派工的逻辑 by zhangxin 2021-09-02 10:05:19 +0800
  • bbd395c 调整生成工艺bom的逻辑 by zhangxin 2021-09-02 10:04:48 +0800
  • 5508e70 为打印条码新增字段映射 by zhangxin 2021-09-02 10:04:10 +0800
  • a414393 新增字段 by zhangxin 2021-09-02 10:03:41 +0800
  • ac9e9c1 修正数据维护时更新其他表的bug by zhangxin 2021-09-02 10:03:16 +0800
  • f04450d 调整排序方式 by zhangxin 2021-09-02 10:02:13 +0800
  • 8867281 新增字段 by zhangxin 2021-09-02 10:01:22 +0800
  • 37d56f3 筛选条件去掉ProjectiD by zhangxin 2021-08-26 11:13:36 +0800
  • e50e656 添加字段 by zhangxin 2021-08-26 11:11:43 +0800
  • 575a406 添加字段 by zhangxin 2021-08-26 11:11:10 +0800
  • b7c20f4 修改排序字段 by zhangxin 2021-08-26 11:10:12 +0800
  • 439077c Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om by zhangxin 2021-08-25 11:24:37 +0800
  • 82096e7 Merge pull request '包装数量修改' (#90) from feature_log into develop by zhangxin 2021-08-25 11:24:10 +0800
  • d4dd014 (refs/pull/90/head, feature_log) 包装数量修改 by louwenzhi 2021-08-25 11:22:13 +0800
  • f7b1b27 (refs/pull/89/head, feature_logorder) 包装修改 by louwenzhi 2021-08-25 11:09:00 +0800
  • 941c84d Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om by zhangxin 2021-08-25 10:40:48 +0800
  • 9b7f2e7 Merge pull request '修改查询语句' (#88) from feature_logorder into develop by zhangxin 2021-08-25 10:36:45 +0800
  • 7fc9b77 (refs/pull/88/head) 修改查询语句 by louwenzhi 2021-08-25 10:35:00 +0800
  • 5517a0e Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om by zhangxin 2021-08-24 18:07:52 +0800
  • ceec09f Merge pull request '包装生成逻辑修改' (#87) from feature_pack into develop by 徐腾飞 2021-08-24 17:33:53 +0800
  • 3103893 (refs/pull/87/head, feature_pack) 包装生成逻辑修改 by louwenzhi 2021-08-24 17:30:34 +0800
  • d742b91 修改生成BOM的逻辑 by zhangxin 2021-08-24 08:26:20 +0800
  • 1597324 修改查询传参位置 by zhangxin 2021-08-24 08:23:07 +0800
  • bdf8b4a 添加查询工艺时新增查询条件projectid by zhangxin 2021-08-23 17:38:50 +0800
  • 5bcc104 新增物料类型 by zhangxin 2021-08-23 17:37:52 +0800
  • a66dd77 修改bom数据维护的逻辑 by zhangxin 2021-08-23 17:37:34 +0800
  • 5885877 查找工艺的添加增项目ID by zhangxin 2021-08-23 17:33:35 +0800
  • c387e3d 添加物料和产线关联关系 by zhangxin 2021-08-23 17:31:22 +0800
  • 561c1dd Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om by zhangxin 2021-08-23 16:51:23 +0800
  • fdb4554 新增工位监控动作数据维护的功能接口 by zhangxin 2021-08-23 16:48:53 +0800
  • e617ddb 增加字段 by zhangxin 2021-08-23 16:47:57 +0800
  • dbedc9d 删除掉无用文件 by zhangxin 2021-08-23 15:15:00 +0800
  • 8b905b8 Merge pull request '添加了新的自动生成代码' (#86) from feature_NewCode into develop by zhangxin 2021-08-23 15:14:27 +0800
  • dc12a72 (refs/pull/86/head) 添加了新的自动生成代码 by allanwei 2021-08-23 15:07:57 +0800
  • 1e7e171 Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_om by zhangxin 2021-08-23 10:23:15 +0800
  • d2e848b Merge pull request '添加了新的自动生成代码' (#85) from feature_NewCode into develop by zhangxin 2021-08-23 10:23:01 +0800
  • 0d1cb6f (refs/pull/85/head) 添加了新的自动生成代码 by allanwei 2021-08-22 15:54:33 +0800
  • 58a7b38 修改包名 by zhangxin 2021-08-20 08:44:02 +0800
  • 2fa0fa0 添加获取所有属性和零件分配规则得方法 by zhangxin 2021-08-20 08:43:46 +0800
  • c6324db 创建订单需要指定workLineId 同时修改opc映射值获取映射值得规则 by zhangxin 2021-08-20 08:42:59 +0800
  • 26dd10c 添加bom拆分功能 by zhangxin 2021-08-20 08:41:58 +0800
  • 0ed4c90 (feature_xml) Merge pull request 'operation增加字段workLineId并进行相应处理，opc和开放协议添加保存接口' (#84) from feature_om into develop by 徐腾飞 2021-08-18 13:46:31 +0800
  • 65f6e81 (refs/pull/84/head) Merge branch 'develop' into feature_om by 徐腾飞 2021-08-18 13:46:07 +0800
  • f5031be 增加worklineId之后修改查询语句 by zhangxin 2021-08-18 13:18:52 +0800
  • 95da962 添加子主条码的参数赋值 by zhangxin 2021-08-18 13:18:21 +0800
  • 1953b97 添加保存的接口 by zhangxin 2021-08-18 13:17:47 +0800
  • a85fa65 Merge pull request '生成包装逻辑' (#83) from feature_packorder into develop by 徐腾飞 2021-08-18 11:21:01 +0800
  • d0713ed (refs/pull/83/head, feature_packorder) 生成包装逻辑 by louwenzhi 2021-08-18 11:18:34 +0800
  • c368df7 Merge pull request 'Log_PackTemplate添加SiteCode' (#82) from feature_xml into develop by 娄文智 2021-08-18 11:13:29 +0800
  • 786dac7 (refs/pull/82/head) Log_PackTemplate添加SiteCode by DESKTOP-4672LME\Xu Tengfei 2021-08-18 11:10:46 +0800
  • c2b4857 添加通过工艺添加开放协议的方法 by zhangxin 2021-08-18 09:52:24 +0800
  • 095b3ea 新增字段workLineId by zhangxin 2021-08-18 09:26:30 +0800
  • 0b20f1f Merge pull request '去掉cancelWorkOrder中对mes数据库的操作' (#81) from feature_om into develop by 徐腾飞 2021-08-17 13:48:22 +0800
  • e6446f4 (refs/pull/81/head) 去掉cancelWorkOrder中对mes数据库的操作 by zhangxin 2021-08-17 13:38:24 +0800