root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2024-03-26 17:38:58 +08:00
parent 9d168f202c d15b0f016c
commit af02b2b27e
6 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
View File

@@ -263,7 +263,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void manualDiv(JSONObject whereJson) {
StIvtIostorinv mstDao = this.getById(whereJson.getJSONObject("row").getString("iostorinv_id"));
@@ -361,7 +361,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void cancelDiv(JSONObject whereJson) {
// 任务表
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");

2
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
View File

@@ -62,7 +62,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
private final IschBaseTaskService ischBaseTaskService;
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void inBox(JSONObject whereJson) {
/*
* 1.找木箱区的一个仓位

2
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java
View File

@@ -62,7 +62,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
private IschBaseTaskService ischBaseTaskService;
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void outBox(JSONObject whereJson) {
/*
* 1.找到符合条件的空木箱

2
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java
View File

@@ -53,7 +53,7 @@ public class OutVehicleManageServiceImpl implements OutVehicleManageService {
private IschBaseTaskService ischBaseTaskService;
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void outVehicle(JSONObject whereJson) {
/*
* 1.找到相同托盘类型的最多的巷道

35
lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
View File

@@ -461,9 +461,14 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
return null;
}
/**
* 需要区分一期二期
* @param param
* @return
*/
@Override
public Map<String, Object> queryAuthority(Map<String, String> param) {
String accountId = "1";
String accountId = SecurityUtils.getCurrentUserId();
JSONObject returnjo = new JSONObject();
if (StrUtil.isEmpty(accountId)) {
returnjo.put("code", "0");
@@ -475,19 +480,23 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
if(ObjectUtil.isEmpty(pa)){
throw new BadRequestException("当前用户无菜单权限！");
}
JSONObject result = pa.getJSONObject(0);
//查询二级
JSONArray SecondResults = baseMapper.queryPdaAuthority(accountId, "1", null);
//查询三级
JSONArray roleTree = new JSONArray();
for (int i = 0; i < SecondResults.size(); i++) {
JSONObject row = SecondResults.getJSONObject(i);
String menu_id = row.getString("menu_id");
JSONArray ThirdResults = baseMapper.queryPdaAuthority(accountId, "2", menu_id);
row.put("sonTree", ThirdResults);
roleTree.add(row);
JSONObject result = new JSONObject();
for (int i = 0; i < pa.size(); i++) {
JSONObject res = pa.getJSONObject(i);
//查询二级
JSONArray secondResults = baseMapper.queryPdaAuthority(accountId, "1", res.getString("menu_id"));
//查询三级
JSONArray roleTree = new JSONArray();
for (int j = 0; j < secondResults.size(); j++) {
JSONObject row = secondResults.getJSONObject(j);
String menu_id = row.getString("menu_id");
JSONArray ThirdResults = baseMapper.queryPdaAuthority(accountId, "2", menu_id);
row.put("sonTree", ThirdResults);
roleTree.add(row);
}
res.put("sonTree", roleTree);
result.put("rf_menu" + i, res);
}
result.put("sonTree", roleTree);
returnjo.put("code", "1");
returnjo.put("desc", "查询成功！");

1
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java
View File

@@ -443,6 +443,7 @@ public class ProductScrapServiceImpl implements ProductScrapService {
JSONObject jsonObject = new JSONObject();
jsonObject.put("ext_code", result.getString("RTDAT"));
// 单据状态改变 10(生成) -> 20（审核）
jsonObject.put("bill_status", "20");
mst.update(jsonObject, "scrap_id = '" + whereJson.getString("scrap_id") + "'");