From aeb30d72af3efcaf2e92c449f3927a31c3348dc9 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 12 三月 2025 16:06:16 +0800 Subject: [PATCH] #新增 1. 新增ASN订单导入功能 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 11 - rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java | 3 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/AsnOrderItemParams.java | 24 ++++ rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 52 ++++++++++ rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java | 30 +++++ rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java | 109 +++++++++++++++++++++ rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java | 7 + rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 1 rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java | 2 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java | 6 + 10 files changed, 232 insertions(+), 13 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java index addfeef..cde039e 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java @@ -24,7 +24,7 @@ generator.table="man_qly_inspect"; generator.tableDesc="璐ㄦ淇℃伅"; - generator.packagePath="com.vincent.rsf.server.manager"; + generator.packagePath="com.vincent.rsf.server.test"; generator.build(); } diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java index c9f0206..2496618 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java @@ -1,18 +1,15 @@ package com.vincent.rsf.server.common.utils; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.vincent.rsf.framework.common.SpringUtils; import com.vincent.rsf.server.system.entity.Fields; import com.vincent.rsf.server.system.entity.FieldsItem; import com.vincent.rsf.server.system.service.FieldsItemService; import com.vincent.rsf.server.system.service.FieldsService; -import org.springframework.context.annotation.Configuration; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** * @author Ryan diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java index 8e070ac..80e9d25 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.vincent.rsf.framework.common.Cools; import com.vincent.rsf.framework.common.R; +import com.vincent.rsf.framework.exception.CoolException; import com.vincent.rsf.server.common.utils.ExcelUtil; import com.vincent.rsf.server.common.annotation.OperationLog; import com.vincent.rsf.server.common.domain.BaseParam; @@ -17,7 +18,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import javax.mail.Multipart; import javax.servlet.http.HttpServletResponse; import java.util.*; @@ -129,13 +132,5 @@ } else { return R.error("涓�閿笂鎶ュけ璐ワ紒锛�"); } - } - - @PostMapping("/asnOrder") - @ApiOperation("ASN瀵煎叆鎺ュ彛") - @PreAuthorize("hasAuthority('manager:asnOrder:update')") - public R importExcel() { - - return R.ok(); } } diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java index a4a54c6..ab28479 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java @@ -4,18 +4,24 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.vincent.rsf.framework.common.Cools; import com.vincent.rsf.framework.common.R; +import com.vincent.rsf.framework.exception.CoolException; import com.vincent.rsf.server.common.utils.ExcelUtil; import com.vincent.rsf.server.common.annotation.OperationLog; import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.KeyValVo; import com.vincent.rsf.server.common.domain.PageParam; +import com.vincent.rsf.server.manager.controller.params.AsnOrderItemParams; import com.vincent.rsf.server.manager.entity.AsnOrderItem; import com.vincent.rsf.server.manager.service.AsnOrderItemService; import com.vincent.rsf.server.system.controller.BaseController; +import com.vincent.rsf.server.system.utils.SerialRuleUtils; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.*; @@ -57,7 +63,10 @@ public R save(@RequestBody AsnOrderItem asnOrderItem) { asnOrderItem.setCreateBy(getLoginUserId()); asnOrderItem.setUpdateBy(getLoginUserId()); -// asnOrderItemService.getFieldsExtend + String code = SerialRuleUtils.generateRuleCode("sys_ans_order", asnOrderItem); + if (!Objects.isNull(code)) { + asnOrderItem.setAsnCode(code); + } if (!asnOrderItemService.save(asnOrderItem)) { return R.error("Save Fail"); } @@ -106,4 +115,23 @@ ExcelUtil.build(ExcelUtil.create(asnOrderItemService.list(), AsnOrderItem.class), response); } + /** + * ASN鍗曟嵁鏄庣粏瀵煎叆 + * @param file + * @return + */ + @PostMapping("/asnOrder/import") + @ApiOperation("ASN瀵煎叆鎺ュ彛") + @PreAuthorize("hasAuthority('manager:asnOrder:update')") + public R importExcel(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request) throws Exception { + if (Objects.isNull(file)) { + throw new CoolException("鏂囦欢涓嶈兘涓虹┖锛侊紒"); + } + HashMap<String, Object> hashMap = new HashMap<>(); + if (!Objects.isNull(request.getParameter("asnId"))) { + hashMap.put("asnId", request.getParameter("asnId")); + } + return asnOrderItemService.excelImport(file, hashMap); + } + } diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/AsnOrderItemParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/AsnOrderItemParams.java new file mode 100644 index 0000000..2a7587b --- /dev/null +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/AsnOrderItemParams.java @@ -0,0 +1,24 @@ +package com.vincent.rsf.server.manager.controller.params; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.web.multipart.MultipartFile; + +/** + * @author Ryan + * @version 1.0 + * @title AsnOrderItemParams + * @description + * @create 2025/3/12 13:44 + */ +@Data +@ApiModel(value = "AsnOrderItemParams", description = "ASN鏄庣粏瀵煎叆瀹炰緥") +public class AsnOrderItemParams { + + @ApiModelProperty("excel琛ㄦ牸鏂囦欢") + private MultipartFile file; + + @ApiModelProperty("涓诲崟鏍囪瘑") + private String AsnOrderId; +} diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java index f1e98da..e2773cd 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java @@ -39,6 +39,12 @@ private Long asnId; /** + * 骞冲彴鏍囪瘑锛堣鍙凤級 + */ + @ApiModelProperty(value = "骞冲彴鏍囪瘑锛堣鍙凤級") + private String platItemId; + + /** * 瀛楁绱㈠紩 */ @ApiModelProperty("瀛楁绱㈠紩") diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java new file mode 100644 index 0000000..6e784bc --- /dev/null +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java @@ -0,0 +1,109 @@ +package com.vincent.rsf.server.manager.entity.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import cn.afterturn.easypoi.handler.inter.IExcelDataModel; +import cn.afterturn.easypoi.handler.inter.IExcelModel; +import com.vincent.rsf.server.manager.entity.excel.annotation.ExcelAutoColumnSize; +import com.vincent.rsf.server.manager.entity.excel.annotation.ExcelComment; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * @author Ryan + * @version 1.0 + * @title AsnOrderTemplate + * @description + * @create 2025/3/12 13:49 + */ +@Data +@ExcelAutoColumnSize +@Accessors(chain = true) +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = false) +public class AsnOrderTemplate implements IExcelModel, IExcelDataModel, Serializable { + + @Excel(name = "琛屽彿") + @ExcelComment(example = "1357564255478") + private String platItemId; + + @Excel(name = "鐗╂枡鍚嶇О") + @ExcelComment(example = "鐗╂枡鍚嶇О") + private String matnk; + + @Excel(name = "鏁伴噺") + @ExcelComment(example = "25") + private Double anfme; + + @Excel(name = "搴撳瓨鍗曚綅") + @ExcelComment(example = "涓�") + private String stockUnit; + + @Excel(name = "閲囪喘鏁伴噺") + @ExcelComment(example = "25") + private Double purQty; + + @Excel(name = "閲囪喘鍗曚綅") + @ExcelComment(example = "涓�") + private String purUnit; + + @Excel(name = "宸插畬鎴愭暟閲�") + @ExcelComment(example = "25") + private Double qty; + + @Excel(name = "渚涘簲鍟嗙紪鐮�") + @ExcelComment(example = "3654821") + private String splrCode; + + @Excel(name = "渚涘簲鍟嗗悕绉�") + @ExcelComment(example = "娴欐睙涓壃鎶�鏈叕鍙�") + private String splrName; + + @Excel(name = "渚涘簲鍟嗘壒娆�") + @ExcelComment(example = "25251212") + private String splrBatch; + + @Excel(name = "浜岀淮鐮�") + @ExcelComment(example = "") + private String qrcode; + + @Excel(name = "鏉″舰鐮�") + @ExcelComment(example = "2354788") + private String barcode; + + @Excel(name = "鍖呰鍚嶇О") + @ExcelComment(example = "绠�") + private String packName; + + @Excel(name = "澶囨敞") + @ExcelComment(example = "娉細鏄撶鍝侊紝杞绘嬁鏀�") + private String memo; + + + private Integer rowNum; + + private String errorMsg; + + @Override + public Integer getRowNum() { + return this.rowNum; + } + + @Override + public void setRowNum(Integer rowNum) { + this.rowNum = rowNum; + } + + @Override + public String getErrorMsg() { + return this.errorMsg; + } + + @Override + public void setErrorMsg(String errorMsg) { + this.errorMsg = errorMsg; + } +} diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java index bf9ce37..8616605 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java @@ -108,6 +108,7 @@ .setSplrCode(item.getSplrCode()) .setMatnk(item.getMatnrName()) .setPoDetlId(item.getId()) + .setPlatItemId(item.getPlatItemId()) .setBarcode(barcode) .setPoCode(purchase.getCode()) .setPurQty(item.getAnfme()) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java index 0dbfd56..deaee2f 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java @@ -1,8 +1,15 @@ package com.vincent.rsf.server.manager.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.vincent.rsf.framework.common.R; +import com.vincent.rsf.framework.exception.CoolException; import com.vincent.rsf.server.manager.entity.AsnOrderItem; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.util.HashMap; public interface AsnOrderItemService extends IService<AsnOrderItem> { + R excelImport(MultipartFile file, HashMap<String, Object> hashMap) throws Exception; } diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java index 4c611fe..7e5cdf6 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java @@ -1,12 +1,64 @@ package com.vincent.rsf.server.manager.service.impl; +import cn.afterturn.easypoi.excel.ExcelImportUtil; +import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.vincent.rsf.framework.common.R; +import com.vincent.rsf.framework.exception.CoolException; +import com.vincent.rsf.server.common.utils.ExcelUtil; +import com.vincent.rsf.server.manager.entity.AsnOrder; +import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate; +import com.vincent.rsf.server.manager.entity.excel.MatnrsTemplate; import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper; import com.vincent.rsf.server.manager.entity.AsnOrderItem; +import com.vincent.rsf.server.manager.mapper.AsnOrderMapper; import com.vincent.rsf.server.manager.service.AsnOrderItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Objects; @Service("asnOrderItemService") public class AsnOrderItemServiceImpl extends ServiceImpl<AsnOrderItemMapper, AsnOrderItem> implements AsnOrderItemService { + @Resource + private AsnOrderMapper asnOrderMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public R excelImport(MultipartFile file, HashMap<String, Object> hashMap) throws Exception { + + ExcelImportResult<AsnOrderTemplate> result = ExcelImportUtil.importExcelMore(file.getInputStream(), MatnrsTemplate.class, ExcelUtil.getDefaultImportParams()); + if (result.getList().isEmpty()) { + throw new CoolException("鐗╂枡瀵煎叆澶辫触锛侊紒"); + } + if (!Objects.isNull(hashMap.get("asnId"))) { + throw new CoolException("涓诲崟ID涓虹┖锛屾棤娉曟搷浣滐紒锛�"); + } + + AsnOrder order = asnOrderMapper.selectOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getId, hashMap.get("asnId"))); + if (Objects.isNull(order)) { + throw new CoolException("ASN鍗曟嵁涓嶅瓨鍦紒锛�"); + } + List<AsnOrderItem> itemList = new ArrayList<>(); + result.getList().forEach(template -> { + AsnOrderItem orderItem = new AsnOrderItem(); + BeanUtils.copyProperties(template, orderItem); + orderItem.setAsnId(order.getId()) + .setAsnCode(order.getCode()); + itemList.add(orderItem); + }); + if (!this.saveBatch(itemList)) { + throw new CoolException("淇濆瓨澶辫触锛侊紒"); + } + return R.ok("鎿嶄綔鎴愬姛锛侊紒"); + } } -- Gitblit v1.9.1