对接OA调整；修复商品sku异常

src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java

@@ -98,29 +98,39 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper,GoodsSku> im
                 Map<Long,List<GoodsSkuSpecValueVo>> skuValListMap = skuSpecValueVos.stream().collect(Collectors.groupingBy(GoodsSkuSpecValueVo::getSkuId));
                 for (Long skuIdKey : skuValListMap.keySet()) {
                     List<GoodsSkuSpecValueVo> skuSpecValueVoList = skuValListMap.get(skuIdKey);
-                    boolean noExist = skuSpecValueVoList.stream().anyMatch(specValue->{
+                    boolean matchAll = true;
-                        for (GoodsSpecValue goodsSpecValue : goodsSpecValues) {
+                    for (GoodsSpecValue specValue : goodsSpecValues) {
-                            if(goodsSpecValue.getId().equals(specValue.getSpecValueId())){
+                        boolean matchItem = false;
-                                return false;
+                        for (GoodsSkuSpecValueVo specValueVo : skuSpecValueVoList) {
+                            if(specValueVo.getSpecValueId().equals(specValue.getId())){
+                                matchItem = true;
+                                break;
                             }
                         }
-                        return true;
+                        if(!matchItem){
-                    });
+                            matchAll = false;
-                    if(goodsSku.getId()==null&&!noExist){
+                        }
+                    }
+                    if(matchAll&&!skuIdKey.equals(goodsSku.getId())){
                         Assert.throwEx("规格值组合已被占用");
                     }
                 }
             }
             String specInfos = "";
-            for (int i = 0; i < skuSpecValueVos.size(); i++) {
+            for (int i = 0; i < goodsSpecValues.size(); i++) {
-                GoodsSkuSpecValueVo specValueVo = skuSpecValueVos.get(i);
+                GoodsSpecValue specValue = goodsSpecValues.get(i);
                 if( i > 0 ){
                     specInfos = ";"+specInfos;
                 }
-                specInfos = specValueVo.getSpecValue() + specInfos;
+                specInfos = specValue.getName() + specInfos;
             }
             goodsSku.setSpecInfos(specInfos);
             this.saveOrUpdate(goodsSku);
+            if(dbGoodSku!=null){
+                LambdaQueryWrapper<GoodsSkuSpecValue> lqw = new LambdaQueryWrapper<>();
+                lqw.eq(GoodsSkuSpecValue::getSkuId,dbGoodSku.getId());
+                goodsSkuSpecValueService.remove(lqw);
+            }
             for (GoodsSpecValue specValue : goodsSpecValues) {
                 goodsSkuSpecValueService.initSkuSpecValue(goodsSku.getSpuId(),goodsSku.getId(),specValue.getId());
             }

src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java

@@ -9,14 +9,17 @@ public interface TbsSeeYonConst {
     String PRE_TITLE_COST_APPLY = "【预算费用申请】";
     String PRE_TITLE_VERIFICATION = "【预算费用核销】";
 
-    String COST_APPLY_FORM = "CostBill_Test";
+    //模板编码
-    String VERIFICATION_FORM = "CheckCost_Test";
+    String COST_APPLY_CODE = "CostBill_Test";
+    String VERIFICATION_CODE = "CheckCost_Test";
 
-    String VERIFICATION_TMP_ID = "";
+    //模板ID
-    String VERIFICATION_VIEW = "";
+    String COST_APPLY_TMP_ID = "3018014149748736162";
+    String VERIFICATION_TMP_ID = "8370474123848467567";
 
-    String COST_APPLY_TMP_ID = "";
+    //模板对应表单
-    String COST_APPLY_VIEW = "";
+    String VERIFICATION_VIEW = "vw_qs_formmain_1781";
+    String COST_APPLY_VIEW = "vw_qs_formmain_1758";
 
     String API_PROCESS_CREATE = "/process/create";
     String API_PROCESS_COMMIT = "/process/commit";

src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java

@@ -376,7 +376,7 @@ public class TbsCostApplyController {
         if(!costApply.getChargeState().equals(TbsCostApplyState.State_1_apply.getCode())){
             return R.error("费用申请处于未非审批状态!");
         }
-        R<String> result = seeYonService.commonCommit(affairCommit,TbsSeeYonConst.COST_APPLY_FORM);
+        R<String> result = seeYonService.commonCommit(affairCommit,TbsSeeYonConst.COST_APPLY_CODE);
         boolean isBackCommit = affairCommit.getState()==2;
         if(result.getStatus()==200){
             // 判断是否含有下个节点

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@@ -60,13 +60,18 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         //恢复绑定
         this.releaseCost(tbsCostApply.getId(),0);
         Map<String, Object> data = new HashMap<>(10);
-        data.put("empId",sysUser.getCode());
+        data.put("applyUserCode",sysUser.getCode());
-        data.put("applyTime", DateUtils.format(LocalDateTime.now(), DateFormatString.DATE_TIME));
+        data.put("applyUserName",sysUser.getName());
-        data.put("money",tbsCostApply.getTotalActivityAmount());
+        data.put("supplierName",tbsCostApply.getSupplierName());
-        data.put("costApplyCode",tbsCostApply.getId());
+        data.put("supplierCode",tbsCostApply.getSupplierCode());
-        data.put("costApplyId",tbsCostApply.getId());
+        data.put("title",tbsCostApply.getChargeTheme());
+        data.put("rowDate",DateUtils.format(LocalDateTime.now(), DateFormatString.DATE_TIME));
+        data.put("orgId",tbsCostApply.getId());
+        data.put("targetId",tbsCostApply.getId());
+        data.put("targetCode",tbsCostApply.getCode());
+        data.put("exsp1",TbsSeeYonConst.COST_APPLY_CODE);
         BaseCreateProcessBo createProcess = new BaseCreateProcessBo();
-        createProcess.setTemplateCode(TbsSeeYonConst.COST_APPLY_FORM);
+        createProcess.setTemplateCode(TbsSeeYonConst.COST_APPLY_CODE);
         createProcess.setMemberLoginName(sysUser.getSyAccount());
         createProcess.setSubjectTitle(TbsSeeYonConst.PRE_TITLE_COST_APPLY + tbsCostApply.getChargeTheme());
         createProcess.setDataJson(JsonUtil.objectToJson(data));

src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

@@ -252,7 +252,7 @@ public class VtbVerificationController {
             return R.error("费用申请处于未非审批状态!");
         }
         boolean isBackCommit = affairCommit.getState()==2;
-        R<String> result = seeYonService.commonCommit(affairCommit,TbsSeeYonConst.VERIFICATION_FORM);
+        R<String> result = seeYonService.commonCommit(affairCommit,TbsSeeYonConst.VERIFICATION_CODE);
         if(result.getStatus()==200){
             // 判断是否含有下个节点
             String flag = result.getData();

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -296,7 +296,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         data.put("verAmount",verification.getAmount());
         data.put("verId",verification.getId());
         BaseCreateProcessBo createProcess = new BaseCreateProcessBo();
-        createProcess.setTemplateCode(TbsSeeYonConst.VERIFICATION_FORM);
+        createProcess.setTemplateCode(TbsSeeYonConst.VERIFICATION_VIEW);
         createProcess.setMemberLoginName(sysUser.getSyAccount());
         createProcess.setSubjectTitle(TbsSeeYonConst.PRE_TITLE_VERIFICATION + verification.getRemark());
         createProcess.setDataJson(JsonUtil.objectToJson(data));

src/main/resources/application.yml

@@ -4,7 +4,7 @@ spring:
       max-file-size: 6MB
       max-request-size: 12MB
   profiles:
-    include: dev
+    active: dev
   main:
     #easypoi启用覆盖
     allow-bean-definition-overriding: true