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

rev:客户信息，供应商信息分类异常

Browse Source
This commit is contained in:
gengby
2024-07-16 13:39:17 +08:00
parent a8dbf3c7cf
commit 637c219e47
5 changed files with 66 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/customer/controller/BmCustomerController.java
View File

@@ -31,7 +31,7 @@ import java.util.*;
**/
@RestController
@RequiredArgsConstructor
@RequestMapping("/api/customerbase")
@RequestMapping("/api/bmCustomer")
@Slf4j
public class BmCustomerController {

13
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/controller/BmSupplierController.java
View File

@@ -2,11 +2,15 @@
package org.nl.wms.base_manage.supplier.controller;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.entity.PageQuery;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.base_manage.supplier.service.IBmSupplierService;
import org.nl.wms.base_manage.supplier.service.dao.BmSupplier;
import org.nl.wms.base_manage.supplier.service.dto.SupplierQuery;
@@ -39,6 +43,10 @@ public class BmSupplierController {
@PostMapping
public ResponseEntity<Object> create(@Validated @RequestBody BmSupplier dto) {
dto.setSupp_id(IdUtil.getLongId());
dto.setCreate_id(SecurityUtils.getCurrentUserId());
dto.setCreate_name(SecurityUtils.getCurrentNickName());
dto.setCreate_time(DateUtil.now());
supplierService.save(dto);
return new ResponseEntity<>(HttpStatus.OK);
}
@@ -46,7 +54,10 @@ public class BmSupplierController {
@PutMapping
public ResponseEntity<Object> update(@Validated @RequestBody BmSupplier dto) {
supplierService.update(dto, new LambdaUpdateWrapper<BmSupplier>().eq(BmSupplier::getSupp_id, dto.getSupp_id()));
dto.setUpdate_id(SecurityUtils.getCurrentUserId());
dto.setUpdate_name(SecurityUtils.getCurrentNickName());
dto.setUpdate_time(DateUtil.now());
supplierService.update(dto,new LambdaQueryWrapper<BmSupplier>().eq(BmSupplier::getSupp_id,dto.getSupp_id()));
return new ResponseEntity<>(HttpStatus.OK);
}

19
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/dao/BmSupplier.java
View File

@@ -129,10 +129,6 @@ public class BmSupplier implements Serializable {
*/
private String ext_id;
/**
* 条码打印起始值
*/
private String barcode_print;
/**
* 备注
@@ -142,20 +138,7 @@ public class BmSupplier implements Serializable {
/**
* 分类标识
*/
private Long class_id;
private String class_id;
/**
* 分类编码
*/
private String class_code;
/**
* 分类名称
*/
private String class_name;
/**
* 资金计划履约天数
*/
private BigDecimal honour_days;
}