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

rev:冲突处理

Browse Source
This commit is contained in:
liuxy
2023-05-15 09:37:42 +08:00
parent bad9c80a5f
commit 0f6b643ed3
6 changed files with 6 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtBsrealstorattrController.java
View File

@@ -1,60 +0,0 @@
package org.nl.wms.storage_manage.basedata.controller.storage;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.TableDataInfo;
import org.nl.common.anno.Log;
import org.nl.wms.storage_manage.basedata.service.storage.IStIvtBsrealstorattrService;
import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtBsrealstorattr;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* <p>
* 实物库属性表 前端控制器
* </p>
*
* @author generator
* @since 2023-05-04
*/
@RequestMapping("/api/stIvtBsrealstorattr")
@RestController
@RequiredArgsConstructor
@Api(tags = "实物库属性表")
@Slf4j
public class StIvtBsrealstorattrController {
@Autowired
protected IStIvtBsrealstorattrService stIvtBsrealstorattrService;
@PostMapping("/queryStor")
@Log("查询仓库")
@ApiOperation("查询仓库")
public ResponseEntity<Object> queryStor(@RequestBody JSONObject whereJson) {
List<StIvtBsrealstorattr> list;
//1虚拟库2半成品库3原料库4成品库5备件库
String stor_type = whereJson.getString("stor_type");
QueryWrapper<StIvtBsrealstorattr> wrapper = new QueryWrapper<>();
wrapper.eq("is_used", true);
if (StrUtil.isNotEmpty(stor_type)) {
wrapper.eq("stor_type", stor_type);
}
list = stIvtBsrealstorattrService.list(wrapper);
return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK);
}
}

38
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtStructattrController.java
View File

@@ -1,38 +0,0 @@
package org.nl.wms.storage_manage.basedata.controller.storage;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.ApiOperation;
import org.nl.wms.storage_manage.basedata.service.storage.IStIvtStructattrService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.nl.common.anno.Log;
/**
* <p>
* 仓位属性表 前端控制器
* </p>
*
* @author generator
* @since 2023-05-04
*/
@RestController
@RequestMapping("/api/stIvtStructattr")
public class StIvtStructattrController {
@Autowired
protected IStIvtStructattrService iStIvtStructattrService;
@PostMapping("/getSectCascader")
@Log("获取库区对应仓位下拉框-多级下拉框")
@ApiOperation("获取库区对应仓位下拉框-多级下拉框")
public ResponseEntity<Object> getSectCascader(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(iStIvtStructattrService.getSectCascader(whereJson), HttpStatus.OK);
}
}

18
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/IStIvtStructattrService.java
View File

@@ -1,18 +0,0 @@
package org.nl.wms.storage_manage.basedata.service.storage;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtStructattr;
/**
* <p>
* 仓位属性表 服务类
* </p>
*
* @author generator
* @since 2023-05-04
*/
public interface IStIvtStructattrService extends IService<StIvtStructattr> {
JSONObject getSectCascader(JSONObject jo);
}

68
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/impl/StIvtStructattrServiceImpl.java
View File

@@ -1,68 +0,0 @@
package org.nl.wms.storage_manage.basedata.service.storage.impl;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.wms.storage_manage.basedata.service.storage.IStIvtSectattrService;
import org.nl.wms.storage_manage.basedata.service.storage.IStIvtStructattrService;
import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtBsrealstorattr;
import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtSectattr;
import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtStructattr;
import org.nl.wms.storage_manage.basedata.service.storage.dao.mapper.StIvtStructattrMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 仓位属性表 服务实现类
* </p>
*
* @author generator
* @since 2023-05-04
*/
@Service
public class StIvtStructattrServiceImpl extends ServiceImpl<StIvtStructattrMapper, StIvtStructattr> implements IStIvtStructattrService {
@Autowired
private IStIvtSectattrService sectattrService;
@Autowired
private IStIvtStructattrService structattrService;
@Override
public JSONObject getSectCascader(JSONObject jo) {
String stor_id = jo.getString("stor_id");
if (StrUtil.isEmpty(stor_id)) {
stor_id = "";
}
JSONArray cascader_ja = new JSONArray();
List<StIvtSectattr> list = sectattrService.list(new QueryWrapper<StIvtSectattr>().eq("is_used", true)
.eq("stor_id", stor_id));
list.forEach(sect -> {
JSONObject sect_cas = new JSONObject();
sect_cas.put("value", sect.getSect_id());
sect_cas.put("label", sect.getSect_name());
List<StIvtStructattr> struct_list = structattrService.list(new QueryWrapper<StIvtStructattr>().eq("is_used", true)
.eq("sect_id", sect.getSect_id()));
if (struct_list.size() > 0) {
JSONArray struct_ja = new JSONArray();
struct_list.forEach(struct -> {
JSONObject struct_cas = new JSONObject();
struct_cas.put("value", struct.getStruct_id());
struct_cas.put("label", struct.getStruct_name());
struct_ja.add(struct_cas);
});
sect_cas.put("children", struct_ja);
}
cascader_ja.add(sect_cas);
});
JSONObject result = new JSONObject();
result.put("content", cascader_ja);
return result;
}
}

9
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java
View File

@@ -16,19 +16,14 @@ import org.nl.common.utils.SecurityUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.system.util.CodeUtil;
import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
import org.nl.wms.storage_manage.IOSEnum;
import org.nl.wms.storage_manage.basedata.service.storage.IStIvtBsrealstorattrService;
import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtBsrealstorattr;
import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostorinvCp;
import org.nl.wms.storage_manage.productmanage.service.iostorInv.dto.IostorInvQuery;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvYlService;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdtlYlService;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvYl;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIostorinvYlMapper;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery;
import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvBcp;
import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvdisBcp;
import org.nl.wms.system_manage.service.user.dto.SysUserDetail;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

9
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvdisYlServiceImpl.java
View File

@@ -7,12 +7,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.utils.IdUtil;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtSectattrService;
import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtSectattr;
import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
import org.nl.wms.storage_manage.IOSEnum;
import org.nl.wms.storage_manage.basedata.service.storage.IStIvtSectattrService;
import org.nl.wms.storage_manage.basedata.service.storage.IStIvtStructattrService;
import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtBsrealstorattr;
import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtSectattr;
import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtStructattr;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdisYl;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdtlYl;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIostorinvdisYlMapper;