yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

供应商信息修改

Browse Source
product
chuang 2 years ago
parent 5a496e868a
commit 0d544c979a
17 changed files with 841 additions and 259 deletions
Show Stats Download Patch File Download Diff File

158
SC-boot/linkage-scm/src/main/java/jnpf/supplier/controller/SupplierMobileController.java → SC-boot/linkage-scm/src/main/java/jnpf/supplier/controller/SupplierController.java
Unescape View File

@ -1,56 +1,56 @@
package jnpf.supplier.controller; package jnpf.supplier.controller;
import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import jnpf.base.ActionResult; import jnpf.base.ActionResult;
import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO;
import jnpf.base.UserInfo; import jnpf.base.UserInfo;
import jnpf.base.vo.DownloadVO; import jnpf.base.vo.DownloadVO;
import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO;
import jnpf.config.ConfigValueUtil; import jnpf.config.ConfigValueUtil;
import jnpf.exception.DataException; import jnpf.exception.DataException;
import org.springframework.transaction.annotation.Transactional; import jnpf.supplier.entity.SupplierEntity;
import jnpf.supplier.entity.SupplierMobileEntity;
import jnpf.supplier.model.supplier.*; import jnpf.supplier.model.supplier.*;
import jnpf.supplier.model.supplier.SupplierPagination; import jnpf.supplier.service.SupplierService;
import jnpf.util.*; import jnpf.util.*;
import lombok.extern.slf4j.Slf4j; import jnpf.util.enums.FileTypeEnum;
import jnpf.util.file.UploadUtil;
import lombok.Cleanup; import lombok.Cleanup;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import jnpf.supplier.entity.SupplierMobileEntity;
import jnpf.supplier.service.SupplierMobileService;
import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid; import javax.validation.Valid;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import jnpf.util.GeneraterSwapUtil; import java.util.ArrayList;
import java.util.*; import java.util.HashMap;
import java.util.List;
import jnpf.util.file.UploadUtil; import java.util.Map;
import jnpf.util.enums.FileTypeEnum;
/** /**
* *
* supplier * 供应商档案
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-13 * @日期： 2023-02-16
*/ */
@Slf4j @Slf4j
@RestController @RestController
@Api(tags = "supplier" , value = "supplier") @Api(tags = "供应商档案" , value = "example")
@RequestMapping("/api/supplier/Supplier") @RequestMapping("/api/example/Supplier")
public class SupplierMobileController { public class SupplierController {
@Autowired @Autowired
private GeneraterSwapUtil generaterSwapUtil; private GeneraterSwapUtil generaterSwapUtil;
@ -62,7 +62,7 @@ public class SupplierMobileController {
private UserProvider userProvider; private UserProvider userProvider;
@Autowired @Autowired
private SupplierMobileService supplierMobileService; private SupplierService supplierService;
@ -75,10 +75,12 @@ public class SupplierMobileController {
*/ */
@PostMapping("/getList") @PostMapping("/getList")
public ActionResult list(@RequestBody SupplierPagination supplierPagination)throws IOException{ public ActionResult list(@RequestBody SupplierPagination supplierPagination)throws IOException{
List<SupplierMobileEntity> list= supplierMobileService.getList(supplierPagination); List<SupplierMobileEntity> list= supplierService.getList(supplierPagination);
//处理id字段转名称，若无需转或者为空可删除 //处理id字段转名称，若无需转或者为空可删除
for(SupplierMobileEntity entity:list){ for(SupplierMobileEntity entity:list){
entity.setCompanyId(generaterSwapUtil.comSelectValues(entity.getCompanyId())); Map<String,Object> companyIdMap = new HashMap<>();
entity.setCompanyId(generaterSwapUtil.getPopupSelectValue("394016341591396805","F_Id","F_FullName",entity.getCompanyId(),companyIdMap));
entity.setProvince(generaterSwapUtil.provinceData(entity.getProvince()));
entity.setStatus(generaterSwapUtil.switchSelectValue(entity.getStatus() ,"1" ,"0")); entity.setStatus(generaterSwapUtil.switchSelectValue(entity.getStatus() ,"1" ,"0"));
} }
List<SupplierListVO> listVO=JsonUtil.getJsonToList(list,SupplierListVO.class); List<SupplierListVO> listVO=JsonUtil.getJsonToList(list,SupplierListVO.class);
@ -105,9 +107,10 @@ public class SupplierMobileController {
public ActionResult create(@RequestBody @Valid SupplierCrForm supplierCrForm) throws DataException { public ActionResult create(@RequestBody @Valid SupplierCrForm supplierCrForm) throws DataException {
String mainId =RandomUtil.uuId(); String mainId =RandomUtil.uuId();
UserInfo userInfo=userProvider.get(); UserInfo userInfo=userProvider.get();
SupplierMobileEntity entity = JsonUtil.getJsonToBean(supplierCrForm, SupplierMobileEntity.class); supplierCrForm.setCreatorTime(DateUtil.getNow());
SupplierEntity entity = JsonUtil.getJsonToBean(supplierCrForm, SupplierEntity.class);
entity.setId(mainId); entity.setId(mainId);
supplierMobileService.save(entity); supplierService.save(entity);
return ActionResult.success("创建成功"); return ActionResult.success("创建成功");
@ -145,10 +148,12 @@ public class SupplierMobileController {
return ActionResult.fail("请选择导出字段"); return ActionResult.fail("请选择导出字段");
} }
SupplierPagination supplierPagination=JsonUtil.getJsonToBean(supplierPaginationExportModel, SupplierPagination.class); SupplierPagination supplierPagination=JsonUtil.getJsonToBean(supplierPaginationExportModel, SupplierPagination.class);
List<SupplierMobileEntity> list= supplierMobileService.getTypeList(supplierPagination,supplierPaginationExportModel.getDataType()); List<SupplierEntity> list= supplierService.getTypeList(supplierPagination,supplierPaginationExportModel.getDataType());
//处理id字段转名称，若无需转或者为空可删除 //处理id字段转名称，若无需转或者为空可删除
for(SupplierMobileEntity entity:list){ for(SupplierEntity entity:list){
entity.setCompanyId(generaterSwapUtil.comSelectValues(entity.getCompanyId())); Map<String,Object> companyIdMap = new HashMap<>();
entity.setCompanyId(generaterSwapUtil.getPopupSelectValue("394016341591396805","F_Id","F_FullName",entity.getCompanyId(),companyIdMap));
entity.setProvince(generaterSwapUtil.provinceData(entity.getProvince()));
entity.setStatus(generaterSwapUtil.switchSelectValue(entity.getStatus() ,"1" ,"0")); entity.setStatus(generaterSwapUtil.switchSelectValue(entity.getStatus() ,"1" ,"0"));
} }
List<SupplierListVO> listVO=JsonUtil.getJsonToList(list,SupplierListVO.class); List<SupplierListVO> listVO=JsonUtil.getJsonToList(list,SupplierListVO.class);
@ -172,33 +177,75 @@ public class SupplierMobileController {
case "supplierCode" : case "supplierCode" :
entitys.add(new ExcelExportEntity("供应商编码" ,"supplierCode")); entitys.add(new ExcelExportEntity("供应商编码" ,"supplierCode"));
break; break;
case "companyId" :
entitys.add(new ExcelExportEntity("所属公司" ,"companyId"));
break;
case "supplierName" : case "supplierName" :
entitys.add(new ExcelExportEntity("供应商名称" ,"supplierName")); entitys.add(new ExcelExportEntity("供应商名称" ,"supplierName"));
break; break;
case "supplierSiteId" : case "country" :
entitys.add(new ExcelExportEntity("供应商地点ID" ,"supplierSiteId")); entitys.add(new ExcelExportEntity("国家" ,"country"));
break; break;
case "supplierSiteCode" : case "supply" :
entitys.add(new ExcelExportEntity("供应商地点名称" ,"supplierSiteCode")); entitys.add(new ExcelExportEntity("供货指标" ,"supply"));
break; break;
case "companyId" : case "province" :
entitys.add(new ExcelExportEntity("公司名称" ,"companyId")); entitys.add(new ExcelExportEntity("省" ,"province"));
break;
case "address" :
entitys.add(new ExcelExportEntity("地址" ,"address"));
break; break;
case "contactName" : case "contactName" :
entitys.add(new ExcelExportEntity("联系人" ,"contactName")); entitys.add(new ExcelExportEntity("联系人" ,"contactName"));
break; break;
case "supplierLevel" :
entitys.add(new ExcelExportEntity("供应商等级" ,"supplierLevel"));
break;
case "contactPhone" : case "contactPhone" :
entitys.add(new ExcelExportEntity("联系电话" ,"contactPhone")); entitys.add(new ExcelExportEntity("联系电话" ,"contactPhone"));
break; break;
case "supplierLevel" : case "enterprise" :
entitys.add(new ExcelExportEntity("供应商等级" ,"supplierLevel")); entitys.add(new ExcelExportEntity("供应商性质" ,"enterprise"));
break;
case "address" :
entitys.add(new ExcelExportEntity("地址" ,"address"));
break;
case "classification" :
entitys.add(new ExcelExportEntity("供应商类型" ,"classification"));
break;
case "bank" :
entitys.add(new ExcelExportEntity("开户行" ,"bank"));
break;
case "vatRegistrationNum" :
entitys.add(new ExcelExportEntity("纳税编号" ,"vatRegistrationNum"));
break;
case "bankAccount" :
entitys.add(new ExcelExportEntity("银行账户" ,"bankAccount"));
break;
case "taxCode" :
entitys.add(new ExcelExportEntity("默认税码" ,"taxCode"));
break;
case "payable" :
entitys.add(new ExcelExportEntity("应付科目" ,"payable"));
break;
case "isPurchase" :
entitys.add(new ExcelExportEntity("是否采购" ,"isPurchase"));
break;
case "prepaid" :
entitys.add(new ExcelExportEntity("预付科目" ,"prepaid"));
break;
case "isPayment" :
entitys.add(new ExcelExportEntity("是否付款" ,"isPayment"));
break; break;
case "status" : case "status" :
entitys.add(new ExcelExportEntity("启用" ,"status")); entitys.add(new ExcelExportEntity("启用" ,"status"));
break; break;
case "supplierSiteCode" :
entitys.add(new ExcelExportEntity("供应商地点" ,"supplierSiteCode"));
break;
case "creatorTime" :
entitys.add(new ExcelExportEntity("创建时间" ,"creatorTime"));
break;
case "lastModifyTime" :
entitys.add(new ExcelExportEntity("修改时间" ,"lastModifyTime"));
break;
default: default:
break; break;
} }
@ -260,8 +307,14 @@ public class SupplierMobileController {
*/ */
@GetMapping("/{id}") @GetMapping("/{id}")
public ActionResult<SupplierInfoVO> info(@PathVariable("id") String id){ public ActionResult<SupplierInfoVO> info(@PathVariable("id") String id){
SupplierMobileEntity entity= supplierMobileService.getInfo(id); SupplierEntity entity= supplierService.getInfo(id);
SupplierInfoVO vo=JsonUtil.getJsonToBean(entity, SupplierInfoVO.class); SupplierInfoVO vo=JsonUtil.getJsonToBean(entity, SupplierInfoVO.class);
if(vo.getCreatorTime()!=null){
vo.setCreatorTime(vo.getCreatorTime());
}
if(vo.getLastModifyTime()!=null){
vo.setLastModifyTime(vo.getLastModifyTime());
}
//子表 //子表
//副表 //副表
@ -276,7 +329,7 @@ public class SupplierMobileController {
*/ */
@GetMapping("/detail/{id}") @GetMapping("/detail/{id}")
public ActionResult<SupplierInfoVO> detailInfo(@PathVariable("id") String id){ public ActionResult<SupplierInfoVO> detailInfo(@PathVariable("id") String id){
SupplierMobileEntity entity= supplierMobileService.getInfo(id); SupplierEntity entity= supplierService.getInfo(id);
SupplierInfoVO vo=JsonUtil.getJsonToBean(entity, SupplierInfoVO.class); SupplierInfoVO vo=JsonUtil.getJsonToBean(entity, SupplierInfoVO.class);
//子表数据转换 //子表数据转换
@ -284,7 +337,9 @@ public class SupplierMobileController {
//附表数据转换 //附表数据转换
//添加到详情表单对象中 //添加到详情表单对象中
vo.setCompanyId(generaterSwapUtil.comSelectValues(vo.getCompanyId())); Map<String,Object> companyIdMap = new HashMap<>();
vo.setCompanyId(generaterSwapUtil.getPopupSelectValue("394016341591396805","F_Id","F_FullName",vo.getCompanyId(),companyIdMap));
vo.setProvince(generaterSwapUtil.provinceData(vo.getProvince()));
vo.setStatus(generaterSwapUtil.switchSelectValue(vo.getStatus() ,"1" ,"0")); vo.setStatus(generaterSwapUtil.switchSelectValue(vo.getStatus() ,"1" ,"0"));
return ActionResult.success(vo); return ActionResult.success(vo);
@ -303,10 +358,12 @@ public class SupplierMobileController {
@Transactional @Transactional
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid SupplierUpForm supplierUpForm) throws DataException { public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid SupplierUpForm supplierUpForm) throws DataException {
UserInfo userInfo=userProvider.get(); UserInfo userInfo=userProvider.get();
SupplierMobileEntity entity= supplierMobileService.getInfo(id); SupplierEntity entity= supplierService.getInfo(id);
if(entity!=null){ if(entity!=null){
SupplierMobileEntity subentity=JsonUtil.getJsonToBean(supplierUpForm, SupplierMobileEntity.class); supplierUpForm.setLastModifyTime(DateUtil.getNow());
supplierMobileService.update(id, subentity); SupplierEntity subentity=JsonUtil.getJsonToBean(supplierUpForm, SupplierEntity.class);
subentity.setCreatorTime(entity.getCreatorTime());
supplierService.update(id, subentity);
return ActionResult.success("更新成功"); return ActionResult.success("更新成功");
}else{ }else{
return ActionResult.fail("更新失败，数据不存在"); return ActionResult.fail("更新失败，数据不存在");
@ -324,9 +381,9 @@ public class SupplierMobileController {
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
@Transactional @Transactional
public ActionResult delete(@PathVariable("id") String id){ public ActionResult delete(@PathVariable("id") String id){
SupplierMobileEntity entity= supplierMobileService.getInfo(id); SupplierEntity entity= supplierService.getInfo(id);
if(entity!=null){ if(entity!=null){
supplierMobileService.delete(entity); supplierService.delete(entity);
} }
return ActionResult.success("删除成功"); return ActionResult.success("删除成功");
@ -337,9 +394,4 @@ public class SupplierMobileController {
} }

131
SC-boot/linkage-scm/src/main/java/jnpf/supplier/entity/SupplierEntity.java
Unescape View File

@ -0,0 +1,131 @@
package jnpf.supplier.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
/**
*
* 供应商档案
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-16
*/
@Data
@TableName("jg_supplier")
public class SupplierEntity {
@TableId("ID")
private String id;
@TableField("CREATOR_USER_ID")
private String creatorUserId;
@TableField("CREATOR_USER_NAME")
private String creatorUserName;
@TableField("CREATOR_TIME")
private Date creatorTime;
@TableField("LAST_MODIFY_USER_ID")
private String lastModifyUserId;
@TableField("LAST_MODIFY_USER_NAME")
private String lastModifyUserName;
@TableField("LAST_MODIFY_TIME")
private Date lastModifyTime;
@TableField("DELETE_USER_ID")
private String deleteUserId;
@TableField("DELETE_USER_NAME")
private String deleteUserName;
@TableField("DELETE_TIME")
private Date deleteTime;
@TableField("DELETE_MARK")
private String deleteMark;
@TableField("SUPPLIER_CODE")
private String supplierCode;
@TableField("SUPPLIER_NAME")
private String supplierName;
@TableField("SUPPLIER_SITE_ID")
private String supplierSiteId;
@TableField("SUPPLIER_SITE_CODE")
private String supplierSiteCode;
@TableField("COMPANY_ID")
private String companyId;
@TableField("VAT_REGISTRATION_NUM")
private String vatRegistrationNum;
@TableField("ORGNIZE_ID")
private String orgnizeId;
@TableField("DEPARTMENT_ID")
private String departmentId;
@TableField("SUPPLY")
private Integer supply;
@TableField("CONTACT_NAME")
private String contactName;
@TableField("CONTACT_PHONE")
private String contactPhone;
@TableField("SUPPLIER_LEVEL")
private String supplierLevel;
@TableField("ADDRESS")
private String address;
@TableField("STATUS")
private String status;
@TableField("COUNTRY")
private String country;
@TableField("PROVINCE")
private String province;
@TableField("CLASSIFICATION")
private String classification;
@TableField("ENTERPRISE")
private String enterprise;
@TableField("BANK")
private String bank;
@TableField("BANK_ACCOUNT")
private String bankAccount;
@TableField("TAX_CODE")
private String taxCode;
@TableField("PAYABLE")
private String payable;
@TableField("PREPAID")
private String prepaid;
@TableField("IS_PURCHASE")
private String isPurchase;
@TableField("IS_PAYMENT")
private String isPayment;
}

61
SC-boot/linkage-scm/src/main/java/jnpf/supplier/entity/SupplierMobileEntity.java
Unescape View File

@ -1,25 +1,19 @@
package jnpf.supplier.entity; package jnpf.supplier.entity;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonProperty;
/** /**
* * @Author: WangChuang
* 供应商档案 * @Date: 16/2/2023 上午10:06
* @版本： V3.2.0 * @Description //注释：
* @版权： LINKAGE-BOOT * @Version 1.0
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-13
*/ */
@Data @Data
@TableName("jg_supplier")
public class SupplierMobileEntity { public class SupplierMobileEntity {
@TableId("ID") @TableId("ID")
@ -70,9 +64,6 @@ public class SupplierMobileEntity {
@TableField("COMPANY_ID") @TableField("COMPANY_ID")
private String companyId; private String companyId;
@TableField("COMPANY_NAME")
private String companyName;
@TableField("VAT_REGISTRATION_NUM") @TableField("VAT_REGISTRATION_NUM")
private String vatRegistrationNum; private String vatRegistrationNum;
@ -100,4 +91,46 @@ public class SupplierMobileEntity {
@TableField("STATUS") @TableField("STATUS")
private String status; private String status;
@TableField("COUNTRY")
private String country;
@TableField("PROVINCE")
private String province;
@TableField("CLASSIFICATION")
private String classification;
@TableField("ENTERPRISE")
private String enterprise;
@TableField("BANK")
private String bank;
@TableField("BANK_ACCOUNT")
private String bankAccount;
@TableField("TAX_CODE")
private String taxCode;
@TableField("PAYABLE")
private String payable;
@TableField("PREPAID")
private String prepaid;
@TableField("IS_PURCHASE")
private String isPurchase;
@TableField("IS_PAYMENT")
private String isPayment;
private BigDecimal settlemenSum;
private BigDecimal weightSum;
private BigDecimal buckleWeightSum;
private BigDecimal grossWeightSum;
private BigDecimal salesPriceSum;
} }

23
SC-boot/linkage-scm/src/main/java/jnpf/supplier/mapper/SupplierMapper.java
Unescape View File

@ -0,0 +1,23 @@
package jnpf.supplier.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jnpf.supplier.entity.SupplierEntity;
import jnpf.supplier.entity.SupplierMobileEntity;
import org.apache.ibatis.annotations.Param;
/**
*
* 供应商档案
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-16
*/
public interface SupplierMapper extends BaseMapper<SupplierEntity> {
IPage<SupplierMobileEntity> getSupplierList(@Param("page") Page<SupplierMobileEntity> page,@Param("ew") Wrapper<SupplierEntity> queryWrapper);
}

17
SC-boot/linkage-scm/src/main/java/jnpf/supplier/mapper/SupplierMobileMapper.java
Unescape View File

@ -1,17 +0,0 @@
package jnpf.supplier.mapper;
import jnpf.supplier.entity.SupplierMobileEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
*
* supplier
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-13
*/
public interface SupplierMobileMapper extends BaseMapper<SupplierMobileEntity> {
}

90
SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierCrForm.java
Unescape View File

@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-13 * @日期： 2023-02-16
*/ */
@Data @Data
public class SupplierCrForm { public class SupplierCrForm {
@ -23,42 +23,98 @@ public class SupplierCrForm {
@JsonProperty("supplierCode") @JsonProperty("supplierCode")
private String supplierCode; private String supplierCode;
/** 所属公司 **/
@JsonProperty("companyId")
private String companyId;
/** 供应商名称 **/ /** 供应商名称 **/
@JsonProperty("supplierName") @JsonProperty("supplierName")
private String supplierName; private String supplierName;
/** 供应商地点ID **/ /** 国家 **/
@JsonProperty("supplierSiteId") @JsonProperty("country")
private String supplierSiteId; private String country;
/** 供应商地点名称 **/ /** 供货指标 **/
@JsonProperty("supplierSiteCode") @JsonProperty("supply")
private String supplierSiteCode; private String supply;
/** 公司名称 **/ /** 省 **/
@JsonProperty("companyId") @JsonProperty("province")
private String companyId; private String province;
/** 地址 **/
@JsonProperty("address")
private String address;
/** 联系人 **/ /** 联系人 **/
@JsonProperty("contactName") @JsonProperty("contactName")
private String contactName; private String contactName;
/** 供应商等级 **/
@JsonProperty("supplierLevel")
private String supplierLevel;
/** 联系电话 **/ /** 联系电话 **/
@JsonProperty("contactPhone") @JsonProperty("contactPhone")
private String contactPhone; private String contactPhone;
/** 供应商等级 **/ /** 供应商性质 **/
@JsonProperty("supplierLevel") @JsonProperty("enterprise")
private String supplierLevel; private String enterprise;
/** 地址 **/
@JsonProperty("address")
private String address;
/** 供应商类型 **/
@JsonProperty("classification")
private String classification;
/** 开户行 **/
@JsonProperty("bank")
private String bank;
/** 纳税编号 **/
@JsonProperty("vatRegistrationNum")
private String vatRegistrationNum;
/** 银行账户 **/
@JsonProperty("bankAccount")
private String bankAccount;
/** 默认税码 **/
@JsonProperty("taxCode")
private String taxCode;
/** 应付科目 **/
@JsonProperty("payable")
private String payable;
/** 是否采购 **/
@JsonProperty("isPurchase")
private String isPurchase;
/** 预付科目 **/
@JsonProperty("prepaid")
private String prepaid;
/** 是否付款 **/
@JsonProperty("isPayment")
private String isPayment;
/** 启用 **/ /** 启用 **/
@JsonProperty("status") @JsonProperty("status")
private String status; private String status;
/** 供应商地点 **/
@JsonProperty("supplierSiteCode")
private String supplierSiteCode;
/** 创建时间 **/
@JsonProperty("creatorTime")
private String creatorTime;
/** 修改时间 **/
@JsonProperty("lastModifyTime")
private String lastModifyTime;
} }

92
SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierInfoVO.java
Unescape View File

@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-13 * @日期： 2023-02-16
*/ */
@Data @Data
public class SupplierInfoVO{ public class SupplierInfoVO{
@ -27,40 +27,98 @@ public class SupplierInfoVO{
@JsonProperty("supplierCode") @JsonProperty("supplierCode")
private String supplierCode; private String supplierCode;
/** 所属公司 **/
@JsonProperty("companyId")
private String companyId;
/** 供应商名称 **/ /** 供应商名称 **/
@JsonProperty("supplierName") @JsonProperty("supplierName")
private String supplierName; private String supplierName;
/** 供应商地点ID **/ /** 国家 **/
@JsonProperty("supplierSiteId") @JsonProperty("country")
private String supplierSiteId; private String country;
/** 供应商地点名称 **/ /** 供货指标 **/
@JsonProperty("supplierSiteCode") @JsonProperty("supply")
private String supplierSiteCode; private String supply;
/** 公司名称 **/ /** 省 **/
@JsonProperty("companyId") @JsonProperty("province")
private String companyId; private String province;
/** 地址 **/
@JsonProperty("address")
private String address;
/** 联系人 **/ /** 联系人 **/
@JsonProperty("contactName") @JsonProperty("contactName")
private String contactName; private String contactName;
/** 供应商等级 **/
@JsonProperty("supplierLevel")
private String supplierLevel;
/** 联系电话 **/ /** 联系电话 **/
@JsonProperty("contactPhone") @JsonProperty("contactPhone")
private String contactPhone; private String contactPhone;
/** 供应商等级 **/ /** 供应商性质 **/
@JsonProperty("supplierLevel") @JsonProperty("enterprise")
private String supplierLevel; private String enterprise;
/** 地址 **/
@JsonProperty("address")
private String address;
/** 供应商类型 **/
@JsonProperty("classification")
private String classification;
/** 开户行 **/
@JsonProperty("bank")
private String bank;
/** 纳税编号 **/
@JsonProperty("vatRegistrationNum")
private String vatRegistrationNum;
/** 银行账户 **/
@JsonProperty("bankAccount")
private String bankAccount;
/** 默认税码 **/
@JsonProperty("taxCode")
private String taxCode;
/** 应付科目 **/
@JsonProperty("payable")
private String payable;
/** 是否采购 **/
@JsonProperty("isPurchase")
private String isPurchase;
/** 预付科目 **/
@JsonProperty("prepaid")
private String prepaid;
/** 是否付款 **/
@JsonProperty("isPayment")
private String isPayment;
/** 启用 **/ /** 启用 **/
@JsonProperty("status") @JsonProperty("status")
private String status; private String status;
/** 供应商地点 **/
@JsonProperty("supplierSiteCode")
private String supplierSiteCode;
/** 创建时间 **/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonProperty("creatorTime")
private Date creatorTime;
/** 修改时间 **/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonProperty("lastModifyTime")
private Date lastModifyTime;
} }

11
SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierListQuery.java
Unescape View File

@ -10,7 +10,7 @@ import java.util.List;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-13 * @日期： 2023-02-16
*/ */
@Data @Data
public class SupplierListQuery extends Pagination { public class SupplierListQuery extends Pagination {
@ -20,6 +20,15 @@ public class SupplierListQuery extends Pagination {
/** 供应商名称 */ /** 供应商名称 */
private String supplierName; private String supplierName;
/** 联系人 */
private String contactName;
/** 联系电话 */
private String contactPhone;
/** 供应商地点 */
private String supplierSiteCode;
/** /**
* 菜单id * 菜单id
*/ */

123
SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierListVO.java
Unescape View File

@ -3,19 +3,19 @@
package jnpf.supplier.model.supplier; package jnpf.supplier.model.supplier;
import lombok.Data;
import java.sql.Time;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
/** /**
* *
* *
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-13 * @日期： 2023-02-16
*/ */
@Data @Data
public class SupplierListVO{ public class SupplierListVO{
@ -29,29 +29,29 @@ public class SupplierListVO{
private String supplierCode; private String supplierCode;
/** 所属公司 **/
@JsonProperty("companyId")
private String companyId;
/** 供应商名称 **/ /** 供应商名称 **/
@JsonProperty("supplierName") @JsonProperty("supplierName")
private String supplierName; private String supplierName;
/** 供应商地点ID **/ /** 国家 **/
@JsonProperty("supplierSiteId") @JsonProperty("country")
private String supplierSiteId; private String country;
/** 供应商地点名称 **/ /** 供货指标 **/
@JsonProperty("supplierSiteCode") @JsonProperty("supply")
private String supplierSiteCode; private String supply;
/** 公司名称 **/ /** 省 **/
@JsonProperty("companyId") @JsonProperty("province")
private String companyId; private String province;
/** 地址 **/
@JsonProperty("address")
private String address;
/** 联系人 **/ /** 联系人 **/
@ -59,14 +59,69 @@ public class SupplierListVO{
private String contactName; private String contactName;
/** 供应商等级 **/
@JsonProperty("supplierLevel")
private String supplierLevel;
/** 联系电话 **/ /** 联系电话 **/
@JsonProperty("contactPhone") @JsonProperty("contactPhone")
private String contactPhone; private String contactPhone;
/** 供应商等级 **/ /** 供应商性质 **/
@JsonProperty("supplierLevel") @JsonProperty("enterprise")
private String supplierLevel; private String enterprise;
/** 地址 **/
@JsonProperty("address")
private String address;
/** 供应商类型 **/
@JsonProperty("classification")
private String classification;
/** 开户行 **/
@JsonProperty("bank")
private String bank;
/** 纳税编号 **/
@JsonProperty("vatRegistrationNum")
private String vatRegistrationNum;
/** 银行账户 **/
@JsonProperty("bankAccount")
private String bankAccount;
/** 默认税码 **/
@JsonProperty("taxCode")
private String taxCode;
/** 应付科目 **/
@JsonProperty("payable")
private String payable;
/** 是否采购 **/
@JsonProperty("isPurchase")
private String isPurchase;
/** 预付科目 **/
@JsonProperty("prepaid")
private String prepaid;
/** 是否付款 **/
@JsonProperty("isPayment")
private String isPayment;
/** 启用 **/ /** 启用 **/
@ -74,4 +129,30 @@ public class SupplierListVO{
private String status; private String status;
/** 供应商地点 **/
@JsonProperty("supplierSiteCode")
private String supplierSiteCode;
/** 创建时间 **/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonProperty("creatorTime")
private Date creatorTime;
/** 修改时间 **/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonProperty("lastModifyTime")
private Date lastModifyTime;
private BigDecimal settlemenSum;
private BigDecimal weightSum;
private BigDecimal buckleWeightSum;
private BigDecimal grossWeightSum;
private BigDecimal salesPriceSum;
} }

11
SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierPagination.java
Unescape View File

@ -11,7 +11,7 @@ import java.util.List;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-13 * @日期： 2023-02-16
*/ */
@Data @Data
public class SupplierPagination extends Pagination { public class SupplierPagination extends Pagination {
@ -21,6 +21,15 @@ public class SupplierPagination extends Pagination {
/** 供应商名称 */ /** 供应商名称 */
private String supplierName; private String supplierName;
/** 联系人 */
private String contactName;
/** 联系电话 */
private String contactPhone;
/** 供应商地点 */
private String supplierSiteCode;
/** /**
* 菜单id * 菜单id
*/ */

11
SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierPaginationExportModel.java
Unescape View File

@ -9,7 +9,7 @@ import java.util.*;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-13 * @日期： 2023-02-16
*/ */
@Data @Data
public class SupplierPaginationExportModel extends Pagination { public class SupplierPaginationExportModel extends Pagination {
@ -26,4 +26,13 @@ public class SupplierPaginationExportModel extends Pagination {
/** 供应商名称 */ /** 供应商名称 */
private String supplierName; private String supplierName;
/** 联系人 */
private String contactName;
/** 联系电话 */
private String contactPhone;
/** 供应商地点 */
private String supplierSiteCode;
} }

106
SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierUpForm.java
Unescape View File

@ -15,7 +15,7 @@ import lombok.Data;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-13 * @日期： 2023-02-16
*/ */
@Data @Data
public class SupplierUpForm{ public class SupplierUpForm{
@ -28,29 +28,29 @@ public class SupplierUpForm{
private String supplierCode; private String supplierCode;
/** 所属公司 **/
@JsonProperty("companyId")
private String companyId;
/** 供应商名称 **/ /** 供应商名称 **/
@JsonProperty("supplierName") @JsonProperty("supplierName")
private String supplierName; private String supplierName;
/** 供应商地点ID **/ /** 国家 **/
@JsonProperty("supplierSiteId") @JsonProperty("country")
private String supplierSiteId; private String country;
/** 供应商地点名称 **/ /** 供货指标 **/
@JsonProperty("supplierSiteCode") @JsonProperty("supply")
private String supplierSiteCode; private String supply;
/** 公司名称 **/ /** 省 **/
@JsonProperty("companyId") @JsonProperty("province")
private String companyId; private String province;
/** 地址 **/
@JsonProperty("address")
private String address;
/** 联系人 **/ /** 联系人 **/
@ -58,14 +58,69 @@ public class SupplierUpForm{
private String contactName; private String contactName;
/** 供应商等级 **/
@JsonProperty("supplierLevel")
private String supplierLevel;
/** 联系电话 **/ /** 联系电话 **/
@JsonProperty("contactPhone") @JsonProperty("contactPhone")
private String contactPhone; private String contactPhone;
/** 供应商等级 **/ /** 供应商性质 **/
@JsonProperty("supplierLevel") @JsonProperty("enterprise")
private String supplierLevel; private String enterprise;
/** 地址 **/
@JsonProperty("address")
private String address;
/** 供应商类型 **/
@JsonProperty("classification")
private String classification;
/** 开户行 **/
@JsonProperty("bank")
private String bank;
/** 纳税编号 **/
@JsonProperty("vatRegistrationNum")
private String vatRegistrationNum;
/** 银行账户 **/
@JsonProperty("bankAccount")
private String bankAccount;
/** 默认税码 **/
@JsonProperty("taxCode")
private String taxCode;
/** 应付科目 **/
@JsonProperty("payable")
private String payable;
/** 是否采购 **/
@JsonProperty("isPurchase")
private String isPurchase;
/** 预付科目 **/
@JsonProperty("prepaid")
private String prepaid;
/** 是否付款 **/
@JsonProperty("isPayment")
private String isPayment;
/** 启用 **/ /** 启用 **/
@ -73,4 +128,19 @@ public class SupplierUpForm{
private String status; private String status;
/** 供应商地点 **/
@JsonProperty("supplierSiteCode")
private String supplierSiteCode;
/** 创建时间 **/
@JsonProperty("creatorTime")
private String creatorTime;
/** 修改时间 **/
@JsonProperty("lastModifyTime")
private String lastModifyTime;
} }

34
SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/SupplierMobileService.java
Unescape View File

@ -1,34 +0,0 @@
package jnpf.supplier.service;
import jnpf.supplier.entity.SupplierMobileEntity;
import com.baomidou.mybatisplus.extension.service.IService;
import jnpf.supplier.model.supplier.SupplierPagination;
import java.util.*;
/**
*
* supplier
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-13
*/
public interface SupplierMobileService extends IService<SupplierMobileEntity> {
List<SupplierMobileEntity> getList(SupplierPagination supplierPagination);
List<SupplierMobileEntity> getTypeList(SupplierPagination supplierPagination, String dataType);
SupplierMobileEntity getInfo(String id);
void delete(SupplierMobileEntity entity);
void create(SupplierMobileEntity entity);
boolean update( String id, SupplierMobileEntity entity);
// 子表方法
//列表子表数据方法
}

44
SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/SupplierService.java
Unescape View File

@ -0,0 +1,44 @@
package jnpf.supplier.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import jnpf.supplier.entity.SupplierEntity;
import jnpf.supplier.entity.SupplierMobileEntity;
import jnpf.supplier.model.supplier.SupplierPagination;
import java.util.List;
/**
*
* 供应商档案
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-16
*/
public interface SupplierService extends IService<SupplierEntity> {
List<SupplierMobileEntity> getList(SupplierPagination supplierPagination);
List<SupplierEntity> getTypeList(SupplierPagination supplierPagination,String dataType);
SupplierEntity getInfo(String id);
void delete(SupplierEntity entity);
void create(SupplierEntity entity);
boolean update( String id, SupplierEntity entity);
IPage<SupplierMobileEntity> page(Page<SupplierMobileEntity> page, Wrapper<SupplierEntity> queryWrapper) ;
// 子表方法
//列表子表数据方法
}

137
SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierMobileServiceImpl.java → SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java
Unescape View File

@ -1,38 +1,40 @@
package jnpf.supplier.service.impl; package jnpf.supplier.service.impl;
import jnpf.supplier.entity.*;
import jnpf.supplier.mapper.SupplierMobileMapper;
import jnpf.supplier.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.permission.model.authorize.AuthorizeConditionModel; import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.permission.service.AuthorizeService;
import jnpf.supplier.entity.SupplierEntity;
import jnpf.supplier.entity.SupplierMobileEntity;
import jnpf.supplier.mapper.SupplierMapper;
import jnpf.supplier.model.supplier.SupplierPagination; import jnpf.supplier.model.supplier.SupplierPagination;
import jnpf.supplier.service.SupplierService;
import jnpf.util.ServletUtil;
import jnpf.util.StringUtil;
import jnpf.util.UserProvider;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import jnpf.permission.service.AuthorizeService; import javax.annotation.Resource;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import com.baomidou.mybatisplus.annotation.TableField; import java.util.ArrayList;
import java.util.List;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.beans.factory.annotation.Autowired;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import jnpf.util.*;
import java.util.*;
/** /**
* *
* supplier * 供应商档案
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-13 * 日期： 2023-02-16
*/ */
@Service @Service
public class SupplierMobileServiceImpl extends ServiceImpl<SupplierMobileMapper, SupplierMobileEntity> implements SupplierMobileService { public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, SupplierEntity> implements SupplierService {
@Autowired @Autowired
@ -41,7 +43,8 @@ public class SupplierMobileServiceImpl extends ServiceImpl<SupplierMobileMapper,
@Autowired @Autowired
private AuthorizeService authorizeService; private AuthorizeService authorizeService;
@Resource
private SupplierMapper supplierMapper;
@ -51,7 +54,7 @@ public class SupplierMobileServiceImpl extends ServiceImpl<SupplierMobileMapper,
List<String> AllIdList =new ArrayList(); List<String> AllIdList =new ArrayList();
int total=0; int total=0;
int supplierNum =0; int supplierNum =0;
QueryWrapper<SupplierMobileEntity> supplierQueryWrapper=new QueryWrapper<>(); QueryWrapper<SupplierEntity> supplierQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = false;
boolean appPermission = false; boolean appPermission = false;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
@ -61,7 +64,7 @@ public class SupplierMobileServiceImpl extends ServiceImpl<SupplierMobileMapper,
if (ObjectUtil.isEmpty(supplierObj)){ if (ObjectUtil.isEmpty(supplierObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
supplierQueryWrapper = (QueryWrapper<SupplierMobileEntity>)supplierObj; supplierQueryWrapper = (QueryWrapper<SupplierEntity>)supplierObj;
supplierNum++; supplierNum++;
} }
} }
@ -72,7 +75,7 @@ public class SupplierMobileServiceImpl extends ServiceImpl<SupplierMobileMapper,
if (ObjectUtil.isEmpty(supplierObj)){ if (ObjectUtil.isEmpty(supplierObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
supplierQueryWrapper = (QueryWrapper<SupplierMobileEntity>)supplierObj; supplierQueryWrapper = (QueryWrapper<SupplierEntity>)supplierObj;
supplierNum++; supplierNum++;
} }
@ -81,25 +84,40 @@ public class SupplierMobileServiceImpl extends ServiceImpl<SupplierMobileMapper,
} }
if(StringUtil.isNotEmpty(supplierPagination.getSupplierCode())){ if(StringUtil.isNotEmpty(supplierPagination.getSupplierCode())){
supplierNum++; supplierNum++;
supplierQueryWrapper.lambda().like(SupplierMobileEntity::getSupplierCode,supplierPagination.getSupplierCode()); supplierQueryWrapper.lambda().like(SupplierEntity::getSupplierCode,supplierPagination.getSupplierCode());
} }
if(StringUtil.isNotEmpty(supplierPagination.getSupplierName())){ if(StringUtil.isNotEmpty(supplierPagination.getSupplierName())){
supplierNum++; supplierNum++;
supplierQueryWrapper.lambda().like(SupplierMobileEntity::getSupplierName,supplierPagination.getSupplierName()); supplierQueryWrapper.lambda().like(SupplierEntity::getSupplierName,supplierPagination.getSupplierName());
}
if(StringUtil.isNotEmpty(supplierPagination.getContactName())){
supplierNum++;
supplierQueryWrapper.lambda().like(SupplierEntity::getContactName,supplierPagination.getContactName());
}
if(StringUtil.isNotEmpty(supplierPagination.getContactPhone())){
supplierNum++;
supplierQueryWrapper.lambda().like(SupplierEntity::getContactPhone,supplierPagination.getContactPhone());
}
if(StringUtil.isNotEmpty(supplierPagination.getSupplierSiteCode())){
supplierNum++;
supplierQueryWrapper.lambda().like(SupplierEntity::getSupplierSiteCode,supplierPagination.getSupplierSiteCode());
} }
if(AllIdList.size()>0){ if(AllIdList.size()>0){
supplierQueryWrapper.lambda().in(SupplierMobileEntity::getId, AllIdList); supplierQueryWrapper.lambda().in(SupplierEntity::getId, AllIdList);
} }
//排序 //排序
if(StringUtil.isEmpty(supplierPagination.getSidx())){ if(StringUtil.isEmpty(supplierPagination.getSidx())){
supplierQueryWrapper.lambda().orderByDesc(SupplierMobileEntity::getSupplierCode); supplierQueryWrapper.lambda().orderByDesc(SupplierEntity::getCreatorTime);
}else{ }else{
try { try {
String sidx = supplierPagination.getSidx(); String sidx = supplierPagination.getSidx();
SupplierMobileEntity supplierMobileEntity = new SupplierMobileEntity(); SupplierEntity supplierEntity = new SupplierEntity();
Field declaredField = supplierMobileEntity.getClass().getDeclaredField(sidx); Field declaredField = supplierEntity.getClass().getDeclaredField(sidx);
declaredField.setAccessible(true); declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value(); String value = declaredField.getAnnotation(TableField.class).value();
supplierQueryWrapper="asc".equals(supplierPagination.getSort().toLowerCase())?supplierQueryWrapper.orderByAsc(value):supplierQueryWrapper.orderByDesc(value); supplierQueryWrapper="asc".equals(supplierPagination.getSort().toLowerCase())?supplierQueryWrapper.orderByAsc(value):supplierQueryWrapper.orderByDesc(value);
@ -117,12 +135,12 @@ public class SupplierMobileServiceImpl extends ServiceImpl<SupplierMobileMapper,
} }
} }
@Override @Override
public List<SupplierMobileEntity> getTypeList(SupplierPagination supplierPagination, String dataType){ public List<SupplierEntity> getTypeList(SupplierPagination supplierPagination,String dataType){
String userId=userProvider.get().getUserId(); String userId=userProvider.get().getUserId();
List<String> AllIdList =new ArrayList(); List<String> AllIdList =new ArrayList();
int total=0; int total=0;
int supplierNum =0; int supplierNum =0;
QueryWrapper<SupplierMobileEntity> supplierQueryWrapper=new QueryWrapper<>(); QueryWrapper<SupplierEntity> supplierQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = false;
boolean appPermission = false; boolean appPermission = false;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
@ -132,7 +150,7 @@ public class SupplierMobileServiceImpl extends ServiceImpl<SupplierMobileMapper,
if (ObjectUtil.isEmpty(supplierObj)){ if (ObjectUtil.isEmpty(supplierObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
supplierQueryWrapper = (QueryWrapper<SupplierMobileEntity>)supplierObj; supplierQueryWrapper = (QueryWrapper<SupplierEntity>)supplierObj;
supplierNum++; supplierNum++;
} }
} }
@ -143,7 +161,7 @@ public class SupplierMobileServiceImpl extends ServiceImpl<SupplierMobileMapper,
if (ObjectUtil.isEmpty(supplierObj)){ if (ObjectUtil.isEmpty(supplierObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
supplierQueryWrapper = (QueryWrapper<SupplierMobileEntity>)supplierObj; supplierQueryWrapper = (QueryWrapper<SupplierEntity>)supplierObj;
supplierNum++; supplierNum++;
} }
@ -152,25 +170,40 @@ public class SupplierMobileServiceImpl extends ServiceImpl<SupplierMobileMapper,
} }
if(StringUtil.isNotEmpty(supplierPagination.getSupplierCode())){ if(StringUtil.isNotEmpty(supplierPagination.getSupplierCode())){
supplierNum++; supplierNum++;
supplierQueryWrapper.lambda().like(SupplierMobileEntity::getSupplierCode,supplierPagination.getSupplierCode()); supplierQueryWrapper.lambda().like(SupplierEntity::getSupplierCode,supplierPagination.getSupplierCode());
} }
if(StringUtil.isNotEmpty(supplierPagination.getSupplierName())){ if(StringUtil.isNotEmpty(supplierPagination.getSupplierName())){
supplierNum++; supplierNum++;
supplierQueryWrapper.lambda().like(SupplierMobileEntity::getSupplierName,supplierPagination.getSupplierName()); supplierQueryWrapper.lambda().like(SupplierEntity::getSupplierName,supplierPagination.getSupplierName());
}
if(StringUtil.isNotEmpty(supplierPagination.getContactName())){
supplierNum++;
supplierQueryWrapper.lambda().like(SupplierEntity::getContactName,supplierPagination.getContactName());
}
if(StringUtil.isNotEmpty(supplierPagination.getContactPhone())){
supplierNum++;
supplierQueryWrapper.lambda().like(SupplierEntity::getContactPhone,supplierPagination.getContactPhone());
}
if(StringUtil.isNotEmpty(supplierPagination.getSupplierSiteCode())){
supplierNum++;
supplierQueryWrapper.lambda().like(SupplierEntity::getSupplierSiteCode,supplierPagination.getSupplierSiteCode());
} }
if(AllIdList.size()>0){ if(AllIdList.size()>0){
supplierQueryWrapper.lambda().in(SupplierMobileEntity::getId, AllIdList); supplierQueryWrapper.lambda().in(SupplierEntity::getId, AllIdList);
} }
//排序 //排序
if(StringUtil.isEmpty(supplierPagination.getSidx())){ if(StringUtil.isEmpty(supplierPagination.getSidx())){
supplierQueryWrapper.lambda().orderByDesc(SupplierMobileEntity::getSupplierCode); supplierQueryWrapper.lambda().orderByDesc(SupplierEntity::getCreatorTime);
}else{ }else{
try { try {
String sidx = supplierPagination.getSidx(); String sidx = supplierPagination.getSidx();
SupplierMobileEntity supplierMobileEntity = new SupplierMobileEntity(); SupplierEntity supplierEntity = new SupplierEntity();
Field declaredField = supplierMobileEntity.getClass().getDeclaredField(sidx); Field declaredField = supplierEntity.getClass().getDeclaredField(sidx);
declaredField.setAccessible(true); declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value(); String value = declaredField.getAnnotation(TableField.class).value();
supplierQueryWrapper="asc".equals(supplierPagination.getSort().toLowerCase())?supplierQueryWrapper.orderByAsc(value):supplierQueryWrapper.orderByDesc(value); supplierQueryWrapper="asc".equals(supplierPagination.getSort().toLowerCase())?supplierQueryWrapper.orderByAsc(value):supplierQueryWrapper.orderByDesc(value);
@ -180,11 +213,11 @@ public class SupplierMobileServiceImpl extends ServiceImpl<SupplierMobileMapper,
} }
if("0".equals(dataType)){ if("0".equals(dataType)){
if((total>0 && AllIdList.size()>0) || total==0){ if((total>0 && AllIdList.size()>0) || total==0){
Page<SupplierMobileEntity> page=new Page<>(supplierPagination.getCurrentPage(), supplierPagination.getPageSize()); Page<SupplierEntity> page=new Page<>(supplierPagination.getCurrentPage(), supplierPagination.getPageSize());
IPage<SupplierMobileEntity> userIPage=this.page(page, supplierQueryWrapper); IPage<SupplierEntity> userIPage=this.page(page, supplierQueryWrapper);
return supplierPagination.setData(userIPage.getRecords(),userIPage.getTotal()); return supplierPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{ }else{
List<SupplierMobileEntity> list = new ArrayList(); List<SupplierEntity> list = new ArrayList();
return supplierPagination.setData(list, list.size()); return supplierPagination.setData(list, list.size());
} }
}else{ }else{
@ -193,24 +226,30 @@ public class SupplierMobileServiceImpl extends ServiceImpl<SupplierMobileMapper,
} }
@Override @Override
public SupplierMobileEntity getInfo(String id){ public SupplierEntity getInfo(String id){
QueryWrapper<SupplierMobileEntity> queryWrapper=new QueryWrapper<>(); QueryWrapper<SupplierEntity> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(SupplierMobileEntity::getId,id); queryWrapper.lambda().eq(SupplierEntity::getId,id);
return this.getOne(queryWrapper); return this.getOne(queryWrapper);
} }
@Override @Override
public void create(SupplierMobileEntity entity){ public void create(SupplierEntity entity){
this.save(entity); this.save(entity);
} }
@Override @Override
public boolean update(String id, SupplierMobileEntity entity){ public boolean update(String id, SupplierEntity entity){
entity.setId(id); entity.setId(id);
return this.updateById(entity); return this.updateById(entity);
} }
@Override
public IPage<SupplierMobileEntity> page(Page<SupplierMobileEntity> page, Wrapper<SupplierEntity> queryWrapper) {
return supplierMapper.getSupplierList(page,queryWrapper);
}
@Override @Override
public void delete(SupplierMobileEntity entity){ public void delete(SupplierEntity entity){
if(entity!=null){ if(entity!=null){
this.removeById(entity.getId()); this.removeById(entity.getId());
} }

2
SC-boot/linkage-scm/src/main/resources/mapper/customer/CustomerVMapper.xml
Unescape View File

@ -36,7 +36,6 @@
a.enterprise, a.enterprise,
a.classification, a.classification,
a.country, a.country,
a.city,
IFNULL( SUM( b.gross_weight ), 0.0000000000 ) settlemenSum, IFNULL( SUM( b.gross_weight ), 0.0000000000 ) settlemenSum,
IFNULL( SUM( b.net_weight ), 0.0000000000 ) weightSum, IFNULL( SUM( b.net_weight ), 0.0000000000 ) weightSum,
IFNULL( SUM( b.buckle_weight ), 0.0000000000 ) buckleWeightSum, IFNULL( SUM( b.buckle_weight ), 0.0000000000 ) buckleWeightSum,
@ -85,7 +84,6 @@
<result column="enterprise" property="enterprise"/> <result column="enterprise" property="enterprise"/>
<result column="classification" property="classification"/> <result column="classification" property="classification"/>
<result column="country" property="country"/> <result column="country" property="country"/>
<result column="city" property="city"/>
<result column="settlemenSum" property="settlemenSum"/> <result column="settlemenSum" property="settlemenSum"/>
<result column="weightSum" property="weightSum"/> <result column="weightSum" property="weightSum"/>

49
SC-boot/linkage-scm/src/main/resources/mapper/supplier/SupplierinvoicesMapper.xml
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.supplier.mapper.SupplierMobileMapper"> <mapper namespace="jnpf.supplier.mapper.SupplierMapper">
<select id="getSupplierList" resultMap="supplierMap"> <select id="getSupplierList" resultMap="supplierMap">
SELECT SELECT
* *
@ -23,7 +23,6 @@
a.supplier_site_id, a.supplier_site_id,
a.supplier_site_code, a.supplier_site_code,
a.company_id, a.company_id,
a.company_name,
a.vat_registration_num, a.vat_registration_num,
a.orgnize_id, a.orgnize_id,
a.department_id, a.department_id,
@ -33,6 +32,17 @@
a.supplier_level, a.supplier_level,
a.address, a.address,
a.`status`, a.`status`,
a.country,
a.province,
a.classification,
a.enterprise,
a.bank,
a.bank_account,
a.tax_code,
a.payable,
a.prepaid,
a.is_purchase,
a.is_payment,
IFNULL( SUM( b.gross_weight ), 0.0000000000 ) settlemenSum, IFNULL( SUM( b.gross_weight ), 0.0000000000 ) settlemenSum,
IFNULL( SUM( b.net_weight ), 0.0000000000 ) weightSum, IFNULL( SUM( b.net_weight ), 0.0000000000 ) weightSum,
IFNULL( SUM( b.buckle_weight ), 0.0000000000 ) buckleWeightSum, IFNULL( SUM( b.buckle_weight ), 0.0000000000 ) buckleWeightSum,
@ -51,24 +61,24 @@
<resultMap id="supplierMap" type="jnpf.supplier.entity.SupplierMobileEntity"> <resultMap id="supplierMap" type="jnpf.supplier.entity.SupplierMobileEntity">
<result column="id" property="id"/> <result column="id" property="id"/>
<result column="creator_user_id" property="creatoruserid"/> <result column="creator_user_id" property="creatorUserId"/>
<result column="creator_user_name" property="creatorusername"/> <result column="creator_user_name" property="creatorUserName"/>
<result column="creator_time" property="creatortime"/> <result column="creator_time" property="creatorTime"/>
<result column="last_modify_user_id" property="lastmodifyuserid"/> <result column="last_modify_user_id" property="lastModifyUserId"/>
<result column="last_modify_user_name" property="lastmodifyusername"/> <result column="last_modify_user_name" property="lastModifyUserName"/>
<result column="last_modify_time" property="lastmodifytime"/> <result column="last_modify_time" property="lastModifyTime"/>
<result column="delete_user_id" property="deleteuserid"/> <result column="delete_user_id" property="deleteUserId"/>
<result column="delete_user_name" property="deleteusername"/> <result column="delete_user_name" property="deleteUserName"/>
<result column="delete_time" property="deletetime"/> <result column="delete_time" property="deleteTime"/>
<result column="delete_mark" property="deletemark"/> <result column="delete_mark" property="deleteMark"/>
<result column="supplier_code" property="supplierCode"/> <result column="supplier_code" property="supplierCode"/>
<result column="supplier_name" property="supplierName"/> <result column="supplier_name" property="supplierName"/>
<result column="supplier_site_id" property="supplierSiteCode"/> <result column="supplier_site_id" property="supplierSiteCode"/>
<result column="supplier_site_code" property="supplierSiteCode"/> <result column="supplier_site_code" property="supplierSiteCode"/>
<result column="company_id" property="companyId"/> <result column="company_id" property="companyId"/>
<result column="company_name" property="companyName"/>
<result column="vat_registration_num" property="vatRegistrationNum"/> <result column="vat_registration_num" property="vatRegistrationNum"/>
<result column="orgnize_id" property="orgId"/> <result column="orgnize_id" property="orgnizeId"/>
<result column="department_id" property="departmentId"/> <result column="department_id" property="departmentId"/>
<result column="supply" property="supply"/> <result column="supply" property="supply"/>
<result column="contact_name" property="contactName"/> <result column="contact_name" property="contactName"/>
@ -76,6 +86,17 @@
<result column="supplier_level" property="supplierLevel"/> <result column="supplier_level" property="supplierLevel"/>
<result column="address" property="address"/> <result column="address" property="address"/>
<result column="status" property="status"/> <result column="status" property="status"/>
<result column="country" property="country"/>
<result column="province" property="province"/>
<result column="classification" property="classification"/>
<result column="enterprise" property="enterprise"/>
<result column="bank" property="bank"/>
<result column="bank_account" property="bankAccount"/>
<result column="tax_code" property="taxCode"/>
<result column="payable" property="payable"/>
<result column="prepaid" property="prepaid"/>
<result column="is_purchase" property="isPurchase"/>
<result column="is_payment" property="isPayment"/>
<result column="settlemenSum" property="settlemenSum"/> <result column="settlemenSum" property="settlemenSum"/>
<result column="weightSum" property="weightSum"/> <result column="weightSum" property="weightSum"/>
<result column="buckleWeightSum" property="buckleWeightSum"/> <result column="buckleWeightSum" property="buckleWeightSum"/>

Write Preview
Loading…
Cancel
Save