no message

mall-server-api/src/main/java/com/gree/mall/manager/enums/material/PartsRefTypeEnum.java

@@ -0,0 +1,25 @@
+package com.gree.mall.manager.enums.material;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.gree.mall.manager.enums.base.BaseEnum;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
+public enum PartsRefTypeEnum implements BaseEnum {
+    SALES("SALES","销售"),
+    CHANGE_SALES("CHANGE_SALES","新件转销售"),
+    NEW_REFUND("NEW_REFUND","新件返还"),
+    OLD_REFUND("OLD_REFUND","旧件返还"),
+    OUTSIDE_TO_SALES("OUTSIDE_TO_SALES","保外新件转销售"),
+
+    ;
+
+    @EnumValue
+    @JsonValue
+    private final String key;
+    private final String remark;
+}

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitMPurchaseLogic.java

@@ -93,7 +93,7 @@ public class WebsitMPurchaseLogic {
 
         bean.setCompanyWechatId(adminUser.getAdminCompanyWechat().getCompanyWechatId());
         bean.setCompanyWechatName(adminUser.getAdminCompanyWechat().getCompanyName());
-
+        bean.setGoodsType(WebsitGoodsTypeEnum.M.getKey());
         bean.setFlag(MaterialFlagEnum.SAVE.getKey());
         bean.setTotalAmount(BigDecimal.ZERO);
 
@@ -123,6 +123,7 @@ public class WebsitMPurchaseLogic {
     public void edit(WebsitMPurchaseBean bean) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
+        bean.setGoodsType(WebsitGoodsTypeEnum.M.getKey());
         bean.setFlag(MaterialFlagEnum.SAVE.getKey());
         bean.setTotalAmount(BigDecimal.ZERO);
 
@@ -227,7 +228,7 @@ public class WebsitMPurchaseLogic {
                 }
                 // 申请进价*申请数量=申请进价金额
                 itemBean.setApplyCostValue(itemBean.getApplyCost().multiply(itemBean.getApplyQty()).setScale(2, BigDecimal.ROUND_DOWN));
-                itemBean.setCheckQty(itemBean.getApplyCost());
+                itemBean.setCheckQty(itemBean.getApplyQty());
                 itemBean.setGoodsCode(relaGoods.getGoodsCode());
                 itemBean.setGoodsSpecification(relaGoods.getGoodsSpecification());
                 itemBean.setGoodsStockUnit(relaGoods.getGoodsStockUnit());
@@ -440,6 +441,7 @@ public class WebsitMPurchaseLogic {
     }
 
     private void convertOrderParams(WebsitMPurchaseBean bean, WebsitPurchase purchase, List<WebsitPurchaseItem> purchaseItems) {
+        BigDecimal totalAmount = BigDecimal.ZERO;
         // 获取供应商商品记录
         List<WebsitVenderGoodsRelaVO> relaList = this.queryVenderGoods(bean);
         final Map<String, WebsitVenderGoodsRelaVO> relaMap = relaList.stream()
@@ -461,10 +463,11 @@ public class WebsitMPurchaseLogic {
                         .setInStockCost(itemBean.getInStockCost())
                         .setInStockQty(itemBean.getInStockQty());
             }
-            purchase.setTotalAmount(purchase.getTotalAmount().add(item.getCostValue()));
+            totalAmount = totalAmount.add(item.getCostValue());
         }
 
         purchase.setImageUrl(bean.getImageUrl())
+                .setTotalAmount(totalAmount)
                 .setPurchaseTime(bean.getPurchaseTime())
                 .setConfirmRemark(bean.getConfirmRemark());
     }