bairubing/VistarStarDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: bairubing:75c936cd08440e39d5a875a6cf51e0da74ae029e
Branches Tags
bairubing:main
..
compare: bairubing:80e281515cdb1047d1bec3d7bf2f2cc04463e4b3
Branches Tags
bairubing:main

No commits in common. "75c936cd08440e39d5a875a6cf51e0da74ae029e" and "80e281515cdb1047d1bec3d7bf2f2cc04463e4b3" have entirely different histories.
75c936cd08 ... 80e281515c

2 changed files with 4 additions and 4 deletions
Show Stats Expand all files Collapse all files

4
admin.net.pro/Admin.NET/Vistar.Application/Service/ProductionMaterialsManagement/ProductionMaterialsManagementService.cs
View File

@ -59,7 +59,7 @@ public class ProductionMaterialsManagementService : IDynamicApiController, ITran
public async Task<SqlSugarPagedList<ProductionMaterialsManagementOutput>> Page(PageProductionMaterialsManagementInput input) public async Task<SqlSugarPagedList<ProductionMaterialsManagementOutput>> Page(PageProductionMaterialsManagementInput input)
{ {
var query = await _obj112Rep.AsQueryable() var query = await _obj112Rep.AsQueryable()
.Where(x => (x.CheckedStatus == 7 || x.CheckedStatus == 8) && x.deleted == false && x.IsLatestVersion == true && x.fld004973 == "发布") .Where(x => x.CheckedStatus == 7 && x.deleted == false && x.IsLatestVersion == true && x.fld004973=="发布")
.WhereIF(!string.IsNullOrWhiteSpace(input._System_objNBS), u => u._System_objNBS.Contains(input._System_objNBS.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input._System_objNBS), u => u._System_objNBS.Contains(input._System_objNBS.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.fld004598), u => u.fld004598.Contains(input.fld004598.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.fld004598), u => u.fld004598.Contains(input.fld004598.Trim()))
.WhereIF(input.fld004609Range != null && input.fld004609Range.Length == 2, u => u.fld004609 >= input.fld004609Range[0] && u.fld004609 <= input.fld004609Range[1]) .WhereIF(input.fld004609Range != null && input.fld004609Range.Length == 2, u => u.fld004609 >= input.fld004609Range[0] && u.fld004609 <= input.fld004609Range[1])
@ -292,7 +292,7 @@ public class ProductionMaterialsManagementService : IDynamicApiController, ITran
public async Task<List<SapOutput>> TimingSyncToSAP() public async Task<List<SapOutput>> TimingSyncToSAP()
{ {
var input = await _obj112Rep.AsQueryable() var input = await _obj112Rep.AsQueryable()
.Where(x => (x.CheckedStatus == 7 || x.CheckedStatus == 8) && x.deleted == false && x.IsLatestVersion == true && (x.fld004607 == "A" || x.fld004607 == "M") && x.fld004973 == "发布") .Where(x => x.CheckedStatus == 7 && x.deleted == false && x.IsLatestVersion == true&&(x.fld004607=="A"||x.fld004607 == "M") && x.fld004973 == "发布")
.ToListAsync(); .ToListAsync();
const string lengthError = "物料描述长度大于40，请检查！"; const string lengthError = "物料描述长度大于40，请检查！";
var SapOutputList = new List<SapOutput>(); var SapOutputList = new List<SapOutput>();

2
admin.net.pro/Web/src/views/system/job/index.vue
View File

@ -49,7 +49,7 @@
</el-tooltip> </el-tooltip>
</el-button-group> </el-button-group>
<el-button icon="ele-Coin" @click="openJobCluster" plain> 集群控制 </el-button> <el-button icon="ele-Coin" @click="openJobCluster" plain> 集群控制 </el-button>
<el-button icon="ele-Grid" @click="openJobDashboard" plain style="display: none;"> 任务看板 </el-button> <el-button icon="ele-Grid" @click="openJobDashboard" plain> 任务看板 </el-button>
<el-button-group style="padding-left: 12px"> <el-button-group style="padding-left: 12px">
<el-button type="primary" icon="ele-Expand" @click="handleExpand"> 全部展开 </el-button> <el-button type="primary" icon="ele-Expand" @click="handleExpand"> 全部展开 </el-button>
<el-button type="primary" icon="ele-Fold" @click="handleFold"> 全部折叠 </el-button> <el-button type="primary" icon="ele-Fold" @click="handleFold"> 全部折叠 </el-button>