Commit Graph

10 Commits (0537ee5434c0fc10b1e9c5adc5281d1e66cd99f2)

Author SHA1 Message Date
SoulStar 0537ee5434 更新代码
SoulStar 8e16a72a7e debug - 解决合并冲突
SoulStar 0657fe2dcb Merge branch 'dep_wangsr'
# Conflicts:
#	Admin.Core.Api/Controllers/Business/WarehouseController.cs
#	Admin.Core.Model/Model_New/xl_recipe.cs
#	Admin.Core.Service/Service_New/Hw_WarehouseServices.cs
SoulStar ce44035e7f add - 添加接口,物料同步准备测试
CaesarBao bd28d4f107 提交最新源码
CaesarBao 4f66f0d671 修改称量信息上传接口;新增计划下发接口
CaesarBao 422d9ff842 新增投料口开/投料口关、小料称量信息上传接口
liulb@mesnac.com 41d7457722 .
liulb@mesnac.com 0f649ed106
liulb@mesnac.com 2f0a1d1fb5 初始化