179 Commits (89913ff71477073e75bcb7a59d401f10e59dc52d)

Author SHA1 Message Date
philip e909e04bd1 inventory 4 years ago
Leon 9ed8f5f895 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
# Conflicts:
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/InventoryMapper.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Inventory.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/service/InventoryService.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/InventoryServiceImpl.java
4 years ago
Leon 8777d65d43 余料标示 4 years ago
赵嘉伟 82f7d0d36c 7月9日,其他异常响应维护,和异常提报、待办事项Bug修改 4 years ago
philip 9dce721751 上/卸料 4 years ago
Leon c7479acfd9 车间发料功能 4 years ago
Leon c63daa7ef6 增加修改派工单状态接口 4 years ago
Leon 6d157881c1 生产叫料功能提交 4 years ago
Leon b5932fdeb0 移动端主界面 4 years ago
Leon 2108acf969 Merge remote-tracking branch 'mesnac/master'
# Conflicts:
#	dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java
#	dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
#	dispatch/src/main/resources/mapper/UserResourceMapper.xml
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/BomMapper.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Bom.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/service/BomService.java
#	meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/BomServiceImpl.java
#	meapi/src/main/resources/mapper/BomMapper.xml
4 years ago
philip ac9496a822 生产准备任务检验 4 years ago
Leon 53aa7398c2 ERP接口功能代码提交 4 years ago
赵嘉伟 56de63fd6d 员工资源表 逻辑修改提交(完成) 4 years ago
Leon d9388e79db 报错代码处理提交 4 years ago
Leon c9cae37e15 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 4 years ago
赵嘉伟 a73b03311f 员工资源对应表 4 years ago
Leon 1888d1a860 WebService接口日志记录类 4 years ago
Leon d52fd91f67 WebService接口日志记录类 4 years ago
赵嘉伟 e0559aa7b1 员工资源对应表 终极优化 4 years ago
Leon 0a6c5d44b2 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 4 years ago
Leon 858e1a626f WebService接口日志记录类 4 years ago
赵嘉伟 4b90eb9f43 员工资源对应表功能 4 years ago
赵嘉伟 40cb5c404e 员工资源对应表功能 + Z_NWA_USER表提交 4 years ago
Leon d902eeb7fa 外部接口增加 4 years ago
Leon 994ccf6628 项目启动不需要加载所有Mapper内容 4 years ago
Leon 582e283785 工单整理刷新派工单功能 4 years ago
Leon 647c7ac821 增加设备管理模块 4 years ago
赵嘉伟 85e2e00cfd 工作日历、工作时段初始化提交 4 years ago
Leon 3c98e2798f 项目模块创建 4 years ago