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

feat: 添加供应商

Browse Source
This commit is contained in:
liyongde
2025-07-30 13:27:36 +08:00
parent 9c207b18e6
commit 05e7181bb8
10 changed files with 119 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java
View File

@@ -2,17 +2,21 @@ package org.nl.wms.basedata_manage.controller;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.checkerframework.checker.units.qual.A;
import org.nl.common.base.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.exception.BadRequestException;
import org.nl.common.logging.annotation.Log;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.basedata_manage.service.IMdCsSupplierbaseService;
import org.nl.wms.basedata_manage.service.IMdPbStoragevehicleinfoService;
import org.nl.wms.basedata_manage.service.dao.MdCsSupplierbase;
import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo;
import org.nl.wms.warehouse_manage.enums.IOSEnum;
import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService;
@@ -46,6 +50,8 @@ public class GroupController {
private final IMdPbGroupplateService iMdPbGroupplateService;
@Autowired
private final IMdPbStoragevehicleinfoService iMdPbStoragevehicleinfoService;
@Autowired
private IMdCsSupplierbaseService supplierbaseService;
@GetMapping
@Log("分页查询")
@@ -69,6 +75,12 @@ public class GroupController {
throw new BadRequestException("当前载具组盘信息已存在");
}
}
MdCsSupplierbase supp = supplierbaseService.getByCode(group.getString("supp_code"));
if (ObjectUtil.isEmpty(supp)) {
throw new BadRequestException("供应商信息不存在!");
}
groupPlate.setSupp_code(supp.getSupp_code());
groupPlate.setSupp_name(supp.getSupp_name());
groupPlate.setGroup_id(IdUtil.getStringId());
groupPlate.setCreate_id(SecurityUtils.getCurrentUserId());
groupPlate.setCreate_name(SecurityUtils.getCurrentUsername());

5
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/SupplierController.java
View File

@@ -49,6 +49,11 @@ public class SupplierController {
iMdCsSupplierbaseService.create(dto);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PostMapping("/drop-list")
@Log("获取供应商下拉框")
public ResponseEntity<Object> dropList(@RequestBody MdCsSupplierbase dto) {
return new ResponseEntity<>(iMdCsSupplierbaseService.list(), HttpStatus.OK);
}
@PutMapping
@Log("修改供应商")

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/PmFormData.java
View File

@@ -150,6 +150,8 @@ public class PmFormData extends Model<PmFormData> {
* 是否完结
*/
private Integer is_finish;
private String supp_code;
private String supp_name;
/**

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dto/PmFormDataParam.java
View File

@@ -119,6 +119,8 @@ public class PmFormDataParam extends BaseQuery<PmFormData> {
* 说明
*/
private String remark;
private String supper_code;
private String supper_name;
/**
* 是否完结
*/

14
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/impl/PmFormDataServiceImpl.java
View File

@@ -17,8 +17,10 @@ import org.nl.common.utils.CopyUtil;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.basedata_manage.service.IBsrealStorattrService;
import org.nl.wms.basedata_manage.service.IMdCsSupplierbaseService;
import org.nl.wms.basedata_manage.service.IMdPbMeasureunitService;
import org.nl.wms.basedata_manage.service.dao.BsrealStorattr;
import org.nl.wms.basedata_manage.service.dao.MdCsSupplierbase;
import org.nl.wms.basedata_manage.service.dao.MdPbMeasureunit;
import org.nl.wms.pm_manage.service.dao.PmFormData;
import org.nl.wms.pm_manage.service.dao.mapper.PmFormDataMapper;
@@ -69,6 +71,8 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
private IMdPbMeasureunitService iMdPbMeasureunitService;
@Resource
private IBsrealStorattrService iBsrealStorattrService;
@Resource
private IMdCsSupplierbaseService supplierbaseService;
@Override
public Integer syncFormData(String form_type, String dataString) {
@@ -95,6 +99,11 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
if (ObjectUtil.isEmpty(bsrealStorattr)) {
throw new BadRequestException("没有该仓库信息");
}
MdCsSupplierbase supp = supplierbaseService.getByCode(params.getSupper_code());
if (ObjectUtil.isEmpty(supp)) {
throw new BadRequestException("供应商信息不存在!");
}
params.setSupper_name(supp.getSupp_name());
params.setStor_name(bsrealStorattr.getStor_name());
params.setUnit_name(mdPbMeasureunit.getUnit_name());
pmFormDataMapper.insert(getBasicInfo(params, true));
@@ -116,6 +125,11 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
if (ObjectUtil.isEmpty(bsrealStorattr)) {
throw new BadRequestException("没有该仓库信息");
}
MdCsSupplierbase supp = supplierbaseService.getByCode(params.getSupper_code());
if (ObjectUtil.isEmpty(supp)) {
throw new BadRequestException("供应商信息不存在!");
}
params.setSupper_name(supp.getSupp_name());
params.setStor_name(bsrealStorattr.getStor_name());
params.setUnit_name(mdPbMeasureunit.getUnit_name());
pmFormDataMapper.updateById(getBasicInfo(params, false));

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/GroupPlate.java
View File

@@ -110,6 +110,8 @@ public class GroupPlate implements Serializable {
* 来源单据号
*/
private String ext_code;
private String supp_code;
private String supp_name;
/**
* 来源单据类型