基础数据 物料管理 物品清单管理

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java

@@ -9,13 +9,8 @@ import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.bom.vo.*;
-import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO;
-import com.win.module.wms.controller.itempackaging.vo.ItempackagingRespVO;
 import com.win.module.wms.convert.bom.BomConvert;
-import com.win.module.wms.convert.itembasic.ItembasicConvert;
-import com.win.module.wms.convert.itempackaging.ItempackagingConvert;
 import com.win.module.wms.dal.dataobject.bom.BomDO;
-import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.bom.BomService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -170,17 +165,18 @@ public class BomController {
             @Parameter(name = "updatePart", description = "部分更新，默认为 true", example = "true")
     })
     @PreAuthorize("@ss.hasPermission('wms:bom:import')")
-    public void importExcel(HttpServletResponse response,
+    public CommonResult<Map<String, Object>> importExcel(HttpServletResponse response,
                                                          @RequestParam("file") MultipartFile file,
                                                          @RequestParam(value = "mode") Integer mode,
                                                          @RequestParam(value = "updatePart", required = false, defaultValue = "false") Boolean updatePart) throws Exception {
         List<BomImportExcelVo> list = ExcelUtils.read(file, BomImportExcelVo.class);
-        List<BomImportExcelVo> errorList = bomService.importBomList(list, mode, updatePart);
+        List<BomImportErrorVO> errorList = bomService.importBomList(list, mode, updatePart);
         Map<String, Object> returnMap = new HashMap<>();
         returnMap.put("errorCount", errorList.size());
         if(!errorList.isEmpty()) {
             String url = ExcelUtils.writeLocalFile("物料清单导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xls", "错误列表", errorList);
             returnMap.put("errorFile", url);
         }
+        return success(returnMap);
     }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/vo/BomImportErrorVO.java

@@ -0,0 +1,63 @@
+package com.win.module.wms.controller.bom.vo;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.win.framework.excel.core.annotations.DictFormat;
+import com.win.framework.excel.core.convert.DictConvert;
+import com.win.module.wms.enums.DictTypeConstants;
+import lombok.Builder;
+import lombok.Data;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+@Builder
+@ToString(callSuper = true)
+public class BomImportErrorVO {
+    @ExcelProperty("父物料代码")
+    private String productItemCode;
+
+    @ExcelProperty("子物料代码")
+    private String componentItemCode;
+
+    @ExcelProperty(value = "子物料计量单位", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.UOM)
+    private String componentUom;
+
+    @ExcelProperty("子物料数量")
+    private BigDecimal componentQty;
+
+    @ExcelProperty("工序代码")
+    private String processCode;
+
+    @ExcelProperty("版本")
+    private String version;
+
+    @ExcelProperty("层级")
+    private String layer;
+
+    @ExcelProperty(value = "是否可用", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.TRUE_FALSE)
+    private String available;
+
+    @ExcelProperty("生效时间")
+    @ColumnWidth(value = 16)
+    private LocalDateTime activeTime;
+
+    @ExcelProperty("失效时间")
+    @ColumnWidth(value = 16)
+    private LocalDateTime expireTime;
+
+    @ExcelProperty("备注")
+    private String remark;
+
+    @ExcelProperty(value = "导入状态", index = 0)
+    private String importStatus;
+
+    @ExcelProperty(value = "导入说明", index = 1)
+    private String importRemark;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/bom/BomConvert.java

@@ -1,11 +1,7 @@
 package com.win.module.wms.convert.bom;
 
 import com.win.framework.common.pojo.PageResult;
-import com.win.module.wms.controller.bom.vo.BomImportExcelVo;
-import com.win.module.wms.controller.bom.vo.BomCreateReqVO;
-import com.win.module.wms.controller.bom.vo.BomExcelVO;
-import com.win.module.wms.controller.bom.vo.BomRespVO;
-import com.win.module.wms.controller.bom.vo.BomUpdateReqVO;
+import com.win.module.wms.controller.bom.vo.*;
 import com.win.module.wms.dal.dataobject.bom.BomDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
@@ -36,4 +32,6 @@ public interface BomConvert {
 
     List<BomExcelVO> convertList02(List<BomDO> list);
 
+    BomImportErrorVO convert2(  BomImportExcelVo  bean);
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomService.java

@@ -78,7 +78,7 @@ public interface BomService {
      */
     List<BomDO> getBomList(BomExportReqVO exportReqVO);
 
-    List<BomImportExcelVo> importBomList(List<BomImportExcelVo> boms, Integer mode, Boolean updatePart);
+    List<BomImportErrorVO> importBomList(List<BomImportExcelVo> boms, Integer mode, Boolean updatePart);
 
 
     /**

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomServiceImpl.java

@@ -9,10 +9,13 @@ import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.datapermission.core.util.DataPermissionUtils;
 import com.win.module.wms.controller.bom.vo.*;
+import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainImportErrorVO;
 import com.win.module.wms.convert.bom.BomConvert;
+import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestMainConvert;
 import com.win.module.wms.dal.dataobject.bom.BomDO;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.productionlineitem.ProductionlineitemDO;
+import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestMainDO;
 import com.win.module.wms.dal.mysql.bom.BomMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -93,73 +96,76 @@ public class BomServiceImpl implements BomService {
         return bomMapper.selectList(exportReqVO);
     }
 
-    @Override
-    public List<BomImportExcelVo> importBomList(List<BomImportExcelVo> boms, Integer mode, Boolean updatePart) {
-        if (CollUtil.isEmpty(boms)) {
-            throw exception(BOM_IMPORT_LIST_IS_EMPTY);
-        }
-        List<BomImportExcelVo> errorList = new ArrayList<>();
-        boms.forEach(bom -> {
-            String massage = "";
-            if(mode == 2){
+
+    private String validateBomImport( BomDO  bomDo ){
+        StringBuilder message = new StringBuilder();
         try {
             validateBomExists(null);
         } catch (ServiceException ex) {
-                    massage += ex.getMessage() + ",";
+            message.append(ex.getMessage()).append(",");
         }
         try {
-                    validateProductItemCodeExists(null,bom.getProductItemCode());
+            validateProductItemCodeExists(null,bomDo.getProductItemCode());
         } catch (ServiceException ex) {
-                    massage += ex.getMessage() + ",";
+            message.append(ex.getMessage()).append(",");
         }
         try {
-                    validateComponentUomExists(bom.getComponentUom());
+            validateComponentUomExists(bomDo.getComponentUom());
         } catch (ServiceException ex) {
-                    massage += ex.getMessage() + ",";
+            message.append(ex.getMessage()).append(",");
         }
         try {
-                    validateAvailableExists(bom.getAvailable());
+            validateAvailableExists(bomDo.getAvailable());
         } catch (ServiceException ex) {
-                    massage += ex.getMessage() + ",";
+            message.append(ex.getMessage()).append(",");
         }
         try {
-                    validateComponentItemCodeExists(bom.getComponentItemCode());
+            validateComponentItemCodeExists(bomDo.getComponentItemCode());
         } catch (ServiceException ex) {
-                    massage += ex.getMessage() + ",";
+            message.append(ex.getMessage()).append(",");
         }
         try {
-                    validateComponentQtyExists(bom.getComponentQty());
+            validateComponentQtyExists(bomDo.getComponentQty());
         } catch (ServiceException ex) {
-                    massage += ex.getMessage() + ",";
+            message.append(ex.getMessage()).append(",");
         }
         try {
-                    validateProcessCodeExists(bom.getProcessCode());
+            validateProcessCodeExists(bomDo.getProcessCode());
         } catch (ServiceException ex) {
-                    massage += ex.getMessage() + ",";
+            message.append(ex.getMessage()).append(",");
+        }
+        return message.toString();
     }
 
-                if(StrUtil.isNotEmpty(massage)){
-                    massage.substring(0,massage.length()-1);
-                    errorList.add(bom);
+    @Override
+    public List<BomImportErrorVO> importBomList(List<BomImportExcelVo> datas, Integer mode, Boolean updatePart) {
+        if (CollUtil.isEmpty(datas)) {
+            throw exception(BOM_IMPORT_LIST_IS_EMPTY);
         }
-                if(errorList == null){
+        List<BomImportErrorVO> errorList = new ArrayList<>();
+        datas.forEach(bom -> {
+            BomDO bomDO = BomConvert.INSTANCE.convert(bom);
+            String massage = this.validateBomImport(bomDO);
+            boolean flag = true;
+              if(!massage.isEmpty()){
+                  BomImportErrorVO importErrorVO = BomConvert.INSTANCE.convert2(bom);
+                  importErrorVO.setImportStatus("失败");
+                  importErrorVO.setImportRemark(massage.substring(0, massage.length() - 1));
+                  errorList.add(importErrorVO);
+                  flag = false;
+              }
+              if(flag) {
                       // 判断如果不存在，在进行插入
                       BomDO existAccountcalendar = bomMapper.selectByProductItemCode(bom.getProductItemCode());
-                    if (existAccountcalendar == null&& mode != 3) {
-                        bomMapper.insert(BomConvert.INSTANCE.convert(bom));
-                    }
-                    else if (existAccountcalendar != null && mode != 2) {// 如果存在，判断是否允许更新
-                        BomDO bomDO = BomConvert.INSTANCE.convert(bom);
+                      if (existAccountcalendar == null && mode != 3) {
+                          bomMapper.insert(bomDO);
+                      } else if (existAccountcalendar != null && mode != 2) { // 如果存在，判断是否允许更新
                           bomDO.setId(existAccountcalendar.getId());
                           bomMapper.updateById(bomDO);
                       }
               }
-            }
         });
-        //错误不为空并非部分更新，手工回滚
-        if(!errorList.isEmpty() && !updatePart) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-        }
+
         return errorList;
     }