制品报废记录修改

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailBaseVO.java

@@ -1,14 +1,11 @@
 package com.win.module.wms.controller.productscrapRecord.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
-import java.math.BigDecimal;
+
-import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import javax.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -101,4 +98,12 @@ public class ProductscrapRecordDetailBaseVO {
     @Schema(description = "主键ID")
     private Long masterId;
 
+    @Schema(description = "生产线代码")
+    private String productionLineCode;
+
+    @Schema(description = "工位代码")
+    private String workStationCode;
+
+    @Schema(description = "工序代码")
+    private String processCode;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordMainBaseVO.java

@@ -91,4 +91,12 @@ public class ProductscrapRecordMainBaseVO {
     @Schema(description = "是否可用")
     private String available;
 
+    @Schema(description = "车间代码")
+    private String workshopCode;
+
+    @Schema(description = "班组")
+    private String team;
+
+    @Schema(description = "班次")
+    private String shift;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productscrapRequest/ProductscrapRequestDetailConvert.java

@@ -3,6 +3,7 @@ package com.win.module.wms.convert.productscrapRequest;
 import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.productscrapRequest.vo.*;
 import com.win.module.wms.dal.dataobject.productscrapRequest.ProductscrapRequestDetailDO;
+import com.win.module.wms.dal.dataobject.productscrapRequest.RawscrapRequestDetailDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
@@ -34,5 +35,4 @@ public interface ProductscrapRequestDetailConvert {
 
     List<ProductscrapRequestDetailDO> convertList05(List<ProductscrapRequestDetailUpdateReqVO> list);
 
-    ProductscrapRequestBomRespVO convertRespVO(ProductscrapRequestDetailDO productscrapRequestDetailDO);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productscrapRequest/RawscrapRequestDetailConvert.java

@@ -1,10 +1,7 @@
 package com.win.module.wms.convert.productscrapRequest;
 
 import com.win.framework.common.pojo.PageResult;
-import com.win.module.wms.controller.productscrapRequest.vo.RawscrapRequestDetailCreateReqVO;
+import com.win.module.wms.controller.productscrapRequest.vo.*;
-import com.win.module.wms.controller.productscrapRequest.vo.RawscrapRequestDetailExcelVO;
-import com.win.module.wms.controller.productscrapRequest.vo.RawscrapRequestDetailRespVO;
-import com.win.module.wms.controller.productscrapRequest.vo.RawscrapRequestDetailUpdateReqVO;
 import com.win.module.wms.dal.dataobject.productscrapRequest.RawscrapRequestDetailDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
@@ -34,4 +31,5 @@ public interface RawscrapRequestDetailConvert {
 
     List<RawscrapRequestDetailExcelVO> convertList02(List<RawscrapRequestDetailDO> list);
 
+    ProductscrapRequestBomRespVO convertRespVO(RawscrapRequestDetailDO rawscrapRequestDetailDO);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRecord/ProductscrapRecordDetailDO.java

@@ -137,4 +137,16 @@ public class ProductscrapRecordDetailDO extends BaseDO {
      */
     private String jobDetailId;
 
+    /**
+     * 生产线代码
+     */
+    private String productionLineCode;
+    /**
+     * 工位代码
+     */
+    private String workStationCode;
+    /**
+     * 工序代码
+     */
+    private String processCode;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRecord/ProductscrapRecordMainDO.java

@@ -126,4 +126,16 @@ public class ProductscrapRecordMainDO extends BaseDO {
      */
     private String available;
 
+    /**
+     * 车间代码
+     */
+    private String workshopCode;
+    /**
+     * 班组
+     */
+    private String team;
+    /**
+     * 班次
+     */
+    private String shift;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java

@@ -701,11 +701,11 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa
         IPage<ProductscrapRequestBomRespVO> myPage = MyBatisUtils.buildPage(pageVO);
         List<Map<String,Object>> list = jobUtils.bomDismantleList(pageVO.getItemCode(),pageVO.getBomVersion());
         List<ProductscrapRequestBomRespVO> resultList = new ArrayList<>();
-        Map<String, ProductscrapRequestDetailDO> detailbDOMap = new HashMap<>();
+        Map<String, RawscrapRequestDetailDO> detailbDOMap = new HashMap<>();
         if(pageVO.getMasterId() != null){
-            List<ProductscrapRequestDetailDO> detailBOList = productscrapRequestDetailMapper.selectList(pageVO.getMasterId());
+            List<RawscrapRequestDetailDO> detailBOList = rawscrapRequestDetailMapper.selectList(pageVO.getMasterId());
             if(detailBOList != null && detailBOList.size() > 0){
-                detailbDOMap.putAll(detailBOList.stream().collect(Collectors.toMap(ProductscrapRequestDetailDO::getItemCode, item -> item)));
+                detailbDOMap.putAll(detailBOList.stream().collect(Collectors.toMap(RawscrapRequestDetailDO::getItemCode, item -> item)));
             }
         }
         for(Map<String,Object> map:list){
@@ -714,8 +714,8 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa
             productscrapRequestBomRespVO.setItemCode(itemCode);
             if(StringUtils.isNotEmpty(productscrapRequestBomRespVO.getItemCode())){
                 if(detailbDOMap.get(productscrapRequestBomRespVO.getItemCode()) != null){
-                    ProductscrapRequestDetailDO productscrapRequestDetailDO = detailbDOMap.get(productscrapRequestBomRespVO.getItemCode());
+                    RawscrapRequestDetailDO rawscrapRequestDetailDO = detailbDOMap.get(productscrapRequestBomRespVO.getItemCode());
-                    productscrapRequestBomRespVO = ProductscrapRequestDetailConvert.INSTANCE.convertRespVO(productscrapRequestDetailDO);
+                    productscrapRequestBomRespVO = RawscrapRequestDetailConvert.INSTANCE.convertRespVO(rawscrapRequestDetailDO);
                 }else {
                     productscrapRequestBomRespVO.setQty(BigDecimal.ZERO);
                 }