修改商品保存规格

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml

@@ -65,7 +65,7 @@
         spu.sid as goodsSpuSid,
         sku.title goodsSpuName,
         sku.goodsSkuCode,
-        sku.indexes,
+        sku.own_spec as indexes,
         spu.goodsUnitName,
         spu.manufacturerSid,
         spu.manufacturerName
@@ -83,7 +83,7 @@
         sku.title AS goodsSkuTitle,
         sku.goodsSkuCode,
         spu.goodsUnitName AS unit,
-        sku.indexes AS goodsSkuOwnSpec,
+        sku.own_spec AS goodsSkuOwnSpec,
         spu.manufacturerSid,
         spu.manufacturerName
         from base_goods_sku sku

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml

@@ -51,7 +51,7 @@ WHERE
         p.barCode,
         p.goodsUnitName,
         t.goodsTypeName,
-        k.indexes,
+        k.own_spec as indexes,
         p.shelfLife,
         b.brandName,
         m.manufacturerName,

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java

@@ -320,7 +320,8 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
                     skuUpdate.setGoodsSkuCode(dto.getGoodsCode());
                 }
                 if (StringUtils.isNotBlank(dto.getIndexes())) {
-                    skuUpdate.setIndexes(dto.getIndexes());
+//                    skuUpdate.setIndexes(dto.getIndexes());
+                    skuUpdate.setOwnSpec(dto.getIndexes());
                 }
                 skuUpdate.setModifyTime(new Date());
                 baseGoodsSkuService.updateById(skuUpdate);
@@ -395,7 +396,8 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
                     sku.setGoodsSkuCode(dto.getGoodsCode());
                 }
                 if (StringUtils.isNotBlank(dto.getIndexes())) {
-                    sku.setIndexes(dto.getIndexes());
+//                    sku.setIndexes(dto.getIndexes());
+                    sku.setOwnSpec(dto.getIndexes());
                 }
                 baseGoodsSkuService.insert(sku);
                 //商品sku_extend
@@ -523,8 +525,8 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
         }
         BaseGoodsSku sku = baseGoodsSkuService.getOneBySpuSid(sid);
         if (null != sku) {
-            if (StringUtils.isNotBlank(sku.getIndexes())) {
-                vo.setIndexes(sku.getIndexes());
+            if (StringUtils.isNotBlank(sku.getOwnSpec())) {
+                vo.setIndexes(sku.getOwnSpec());
             }
             BaseGoodsSkuExtend skuExtend = baseGoodsSkuExtendService.getOneBySKuSid(sku.getSid());
             if (null != skuExtend) {
@@ -618,8 +620,8 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
                 //商品sku
                 BaseGoodsSku skuUpdate = baseGoodsSkuService.getOneBySpuSid(details.getSid());
                 if (null != skuUpdate) {
-                    if (StringUtils.isNotBlank(skuUpdate.getIndexes())) {
-                        extra.put("goodsSkuOwnSpec", skuUpdate.getIndexes());
+                    if (StringUtils.isNotBlank(skuUpdate.getOwnSpec())) {
+                        extra.put("goodsSkuOwnSpec", skuUpdate.getOwnSpec());
                     }
                 }
                 if (StringUtils.isNotBlank(details.getGoodsUnitName())) {

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyMapper.xml

@@ -34,7 +34,7 @@
         where mainSid = #{sid}
     </select>
     <select id="selListByUserSid" resultType="com.yxt.anrui.oa.biz.adpurchaseassetapply.PurchaseAssetApplyVo">
-        SELECT ae.sid,ofm.billNo
+        SELECT ae.sid,ofm.billNo,ae.assetTypeValue,ae.isStationValue,ae.assetTypeKey,ae.isStationKey
         FROM ad_purchase_asset_apply ae
                  left join oa_form ofm on ae.formSid = ofm.sid
         WHERE ofm.nodeState = '已办结' and ofm.createBySid = #{userSid}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyService.java

@@ -30,6 +30,7 @@ import com.yxt.anrui.oa.biz.adpurchaseassetdetails.AdPurchaseAssetDetailsDto;
 import com.yxt.anrui.oa.biz.adpurchaseassetdetails.AdPurchaseAssetDetailsService;
 import com.yxt.anrui.oa.biz.adpurchaseassetdetails.AdPurchaseAssetDetailsVo;
 import com.yxt.anrui.oa.biz.adreimbursedassetdetails.AdReimbursedAssetDetailsVo;
+import com.yxt.anrui.oa.biz.adreimbursedassetdetails.AssetObjDetailsVo;
 import com.yxt.anrui.oa.biz.adreimbursedassetdetails.AssetObjVo;
 import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService;
 import com.yxt.anrui.oa.biz.oaform.*;
@@ -350,8 +351,14 @@ public class AdPurchaseAssetApplyService extends MybatisBaseService<AdPurchaseAs
                         v.add(d);
                     }
                 }
-                Map<String, List<AdReimbursedAssetDetailsVo>> extra = new HashMap<>();
-                extra.put("list",v);
+                Map<String, AssetObjDetailsVo> extra = new HashMap<>();
+                AssetObjDetailsVo objDetailsVo = new AssetObjDetailsVo();
+                objDetailsVo.setList(v);
+                objDetailsVo.setAssetTypeKey(vo.getAssetTypeKey());
+                objDetailsVo.setAssetTypeValue(vo.getAssetTypeValue());
+                objDetailsVo.setIsStationKey(vo.getIsStationKey());
+                objDetailsVo.setIsStationValue(vo.getIsStationValue());
+                extra.put("obj",objDetailsVo);
                 objVo.setExtra(extra);
                 list.add(objVo);
             }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/PurchaseAssetApplyVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.oa.biz.adpurchaseassetapply;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
@@ -7,4 +8,11 @@ public class PurchaseAssetApplyVo {
 
     private String sid;
     private String billNo;
+    @ApiModelProperty("固定资产类别key")
+    private String assetTypeKey; // 固定资产类别key
+    @ApiModelProperty("固定资产类别value")
+    private String assetTypeValue; // 固定资产类别value
+    @ApiModelProperty("是否有服务站机器设备（1是，0否）")
+    private String isStationKey; // 是否有服务站机器设备（1是，0否）
+    private String isStationValue; // 是否有服务站机器设备（1是，0否）
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adreimbursedassetapply/AdReimbursedAssetApplyService.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.oa.biz.adreimbursedassetapply;
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.oa.biz.adreimbursedassetdetails.AdReimbursedAssetDetailsService;
 import com.yxt.anrui.oa.biz.adreimbursedassetdetails.AdReimbursedAssetDetailsVo;
+import com.yxt.anrui.oa.biz.adreimbursedassetdetails.AssetObjDetailsVo;
 import com.yxt.anrui.oa.biz.adreimbursedassetdetails.AssetObjVo;
 import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService;
 import com.yxt.anrui.oa.biz.oaform.*;
@@ -108,8 +109,14 @@ public class AdReimbursedAssetApplyService extends MybatisBaseService<AdReimburs
             List<AdReimbursedAssetDetailsVo> list = adReimbursedAssetDetailsService.getUpdateInit(sid);
             list.removeAll(Collections.singleton(null));
             if (!list.isEmpty()) {
-                Map<String, List<AdReimbursedAssetDetailsVo>> extra = new HashMap<>();
-                extra.put("list", list);
+                Map<String, AssetObjDetailsVo> extra = new HashMap<>();
+                AssetObjDetailsVo objDetailsVo = new AssetObjDetailsVo();
+                objDetailsVo.setList(list);
+                objDetailsVo.setAssetTypeKey(apply.getAssetTypeKey());
+                objDetailsVo.setAssetTypeValue(apply.getAssetTypeValue());
+                objDetailsVo.setIsStationKey(apply.getIsStationKey());
+                objDetailsVo.setIsStationValue(apply.getIsStationValue());
+                extra.put("obj", objDetailsVo);
                 assetObj.setExtra(extra);
             }
             applyVo.setAssetListObj(assetObj);
@@ -132,7 +139,7 @@ public class AdReimbursedAssetApplyService extends MybatisBaseService<AdReimburs
                 sourceBillNo = assetListObj.getDictValue();
             }
         }
-        Map<String, List<AdReimbursedAssetDetailsVo>> extra = assetListObj.getExtra();
+        Map<String, AssetObjDetailsVo> extra = assetListObj.getExtra();
         if (StringUtils.isBlank(sid)) {
             // 新建操作
             AdReimbursedAssetApply entity = new AdReimbursedAssetApply();
@@ -159,11 +166,15 @@ public class AdReimbursedAssetApplyService extends MybatisBaseService<AdReimburs
             baseMapper.updateById(entity);
         }
         if (null != extra) {
-            List<AdReimbursedAssetDetailsVo> list = extra.get("list");
-            if (!list.isEmpty()) {
-                adReimbursedAssetDetailsService.saveDetails(list, sid);
+            AssetObjDetailsVo objDetailsVo = extra.get("obj");
+            if (null != objDetailsVo) {
+                List<AdReimbursedAssetDetailsVo> list = objDetailsVo.getList();
+                if (!list.isEmpty()) {
+                    adReimbursedAssetDetailsService.saveDetails(list, sid);
+                }
             }
         }
+
         return rb.success().setData(sid);
     }
 

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adreimbursedassetdetails/AssetObjDetailsVo.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.oa.biz.adreimbursedassetdetails;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AssetObjDetailsVo {
+
+    @ApiModelProperty("固定资产类别key")
+    private String assetTypeKey; // 固定资产类别key
+    @ApiModelProperty("固定资产类别value")
+    private String assetTypeValue; // 固定资产类别value
+    @ApiModelProperty("是否有服务站机器设备（1是，0否）")
+    private String isStationKey; // 是否有服务站机器设备（1是，0否）
+    private String isStationValue; // 是否有服务站机器设备（1是，0否）
+
+    private List<AdReimbursedAssetDetailsVo> list;
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adreimbursedassetdetails/AssetObjVo.java

@@ -2,7 +2,6 @@ package com.yxt.anrui.oa.biz.adreimbursedassetdetails;
 
 import lombok.Data;
 
-import java.util.List;
 import java.util.Map;
 
 @Data
@@ -11,6 +10,6 @@ public class AssetObjVo {
     private String id;
     private String dictValue;
 
-    private Map<String, List<AdReimbursedAssetDetailsVo>> extra;
+    private Map<String, AssetObjDetailsVo> extra;
 
 }