소스 검색

改动过的

huanglizhi 1 년 전
부모
커밋
6a95a7f986

+ 15 - 0
module-erp/src/main/java/com/hys/app/controller/erp/use/task/MerchantPayInfo.java

@@ -0,0 +1,15 @@
+package com.hys.app.controller.erp.use.task;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@Data
+public class MerchantPayInfo {
+    private String bankNo = "31010260201000041831";
+    private String bank ="浙江泰隆商业银行股份有限公司上海莘庄支行";
+    private String dutyParagraph ="91310117MA7JB1TQ71";
+    private String invoice ="崴叁(上海)文化传媒有限公司";
+
+}

+ 1 - 0
module-erp/src/main/java/com/hys/app/model/erp/dto/ProductDTO.java

@@ -34,6 +34,7 @@ public class ProductDTO {
     private String barCode;
 
     @ApiModelProperty(name = "sku", value = "sku")
+    @Min(value = 4,message = "sku最小长度4")
     private String sku;
 
     @ApiModelProperty(name = "price", value = "售价")

+ 4 - 0
module-erp/src/main/java/com/hys/app/model/erp/dto/StockDamageReportDTO.java

@@ -1,6 +1,7 @@
 package com.hys.app.model.erp.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.hys.app.model.erp.enums.DamageinventoryEnum;
 import com.hys.app.model.erp.enums.StockDamageReportTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -61,4 +62,7 @@ public class StockDamageReportDTO implements Serializable {
     @NotNull(message = "库存报损单产品不能为空")
     @Valid
     private List<StockDamageReportProductDTO> productList;
+
+    @ApiModelProperty(name = "status", value = "状态")
+    private DamageinventoryEnum status;
 }

+ 1 - 1
module-erp/src/main/java/com/hys/app/model/erp/dto/StockDamageReportProductDTO.java

@@ -42,7 +42,7 @@ public class StockDamageReportProductDTO implements Serializable {
     @ApiModelProperty(name = "product_stock_id", value = "product_stock_id不能为空")
     private Long productStockId;
 
-    @ApiModelProperty(name = "scan_iff_num", value = "差异数量,扫码订单打出来的数据必传")
+    @ApiModelProperty(name = "sn_code_list", value = "录入的序列号")
     List<GoodsSnDO> snCodeList;
 
     private List<AreaStock> areaStockList;

+ 1 - 0
module-erp/src/main/java/com/hys/app/model/erp/enums/DamageinventoryEnum.java

@@ -13,6 +13,7 @@ import lombok.Getter;
 public enum DamageinventoryEnum {
 
     NOT_HANDLE("NOT_HANDLE", "未处理"),
+    CANCEL_HANDLE("CANCEL_HANDLE", "驳回"),
     HAS_HANDLE("HAS_HANDLE", "已处理");
 
     private final String value;

+ 3 - 1
module-erp/src/main/java/com/hys/app/model/erp/vo/OrderVO.java

@@ -2,6 +2,7 @@ package com.hys.app.model.erp.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.hys.app.controller.erp.use.task.MerchantPayInfo;
 import com.hys.app.model.erp.dos.OrderCustomerFee;
 import com.hys.app.model.erp.dos.OrderDO;
 import com.hys.app.model.erp.dos.OrderPaymentDO;
@@ -113,6 +114,7 @@ public class OrderVO extends OrderDO {
     @ApiModelProperty(name = "subtract_stock", value = "核销费用列表")
     List<OrderCustomerFee> orderCustomerFees;
 
-
+    @ApiModelProperty(name = "subtract_stock", value = "商家对公打款信息")
+    private  MerchantPayInfo merchantPayInfo;
 }
 

+ 2 - 0
module-erp/src/main/java/com/hys/app/service/erp/impl/OrderManagerImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.injector.methods.UpdateById;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hys.app.controller.erp.use.task.MerchantPayInfo;
 import com.hys.app.converter.erp.OrderConverter;
 import com.hys.app.framework.database.BaseQueryParam;
 import com.hys.app.framework.database.WebPage;
@@ -161,6 +162,7 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
         List<OrderCustomerFee> orderCustomerFees = orderCustomerFeeManager.list(new LambdaQueryWrapper<OrderCustomerFee>().eq(OrderCustomerFee::getOrderId, id));
         orderVO.setOrderCustomerFees(orderCustomerFees);
         orderVO.setItemList(itemList);
+        orderVO.setMerchantPayInfo(new MerchantPayInfo());
         return orderVO;
     }
 

+ 13 - 3
module-erp/src/main/java/com/hys/app/service/erp/impl/StockDamageReportManagerImpl.java

@@ -130,9 +130,10 @@ public class StockDamageReportManagerImpl extends ServiceImpl<StockDamageReportM
         //如果有序列号,保存序列号和入库单的关系,更爱序列号的状态
         for (StockDamageReportProductDTO aDo : stockDamageReportDTO.getProductList()) {
             if (CollUtil.isNotEmpty(aDo.getSnCodeList())) {
+                StockDamageReportProduct product = bean.stream().filter(item -> item.getProductId().equals(aDo.getProductId())).findFirst().get();
                 aDo.getSnCodeList().forEach(item -> {
                     ItemSnCodeDO itemSnCodeDO = new ItemSnCodeDO();
-                    itemSnCodeDO.setItemId(aDo.getId());
+                    itemSnCodeDO.setItemId(product.getId());
                     itemSnCodeDO.setEntryOutHouseId(report.getWarehouseId());
                     itemSnCodeDO.setType("damage");
                     itemSnCodeDO.setSnCodeId(item.getId());
@@ -175,6 +176,11 @@ public class StockDamageReportManagerImpl extends ServiceImpl<StockDamageReportM
             dto.setProductVO(BeanUtil.copyProperties(productManager.getById(aDo.getProductId()), ProductVO.class));
             List<AreaStock> areaStockList = areaStockManager.list(new LambdaQueryWrapper<AreaStock>().eq(AreaStock::getProductStockId, dto.getProductStockId()));
             dto.setAreaStockList(areaStockList);
+            List<ItemSnCodeDO> list = itemSnCodeManager.list(new LambdaQueryWrapper<ItemSnCodeDO>().eq(ItemSnCodeDO::getItemId, dto.getId()));
+            if (CollUtil.isNotEmpty(list)) {
+                List<Long> collected = list.stream().map(ItemSnCodeDO::getSnCodeId).collect(Collectors.toList());
+                dto.setSnCodeList(goodsSnManager.list(new LambdaQueryWrapper<GoodsSnDO>().in(GoodsSnDO::getId, collected)));
+            }
         }
         reportVO.setProductList(beanList);
         return reportVO;
@@ -239,12 +245,16 @@ public class StockDamageReportManagerImpl extends ServiceImpl<StockDamageReportM
     @Transactional(value = "goodsTransactionManager", propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void submit(Long id, StockDamageReportDTO stockDamageReportDTO) {
         StockDamageReport report = getById(id);
-        if (DamageinventoryEnum.HAS_HANDLE.equals(report.getStatus())) {
+        if (!DamageinventoryEnum.NOT_HANDLE.equals(report.getStatus())) {
             throw new ServiceException("该报损单已处理");
         }
+        if (stockDamageReportDTO.getStatus().equals(DamageinventoryEnum.CANCEL_HANDLE)){
+            report.setStatus(DamageinventoryEnum.CANCEL_HANDLE);
+            updateById(report);
+            return;
+        }
         report.setStatus(DamageinventoryEnum.HAS_HANDLE);
         updateById(report);
-
         List<StockDTO> arrayList = new ArrayList<>();
         //减实际库存
         for (StockDamageReportProductDTO dto : stockDamageReportDTO.getProductList()) {