优化

platform-dao/src/main/java/com/platform/dao/dto/spareAdd/Inventory.java

@@ -7,21 +7,24 @@ import java.io.Serializable;
 
 @Data
 public class Inventory implements Serializable {
-    private String cInvCCode;//存货分类编码
+    private String cInvCCode="1";//存货分类编码
     private String cComUnitCode;//主计量单位编码
     private String cInvName;//存货名称
     private String cInvStd;//规格型号
+    private String cGroupCode="1";//计量单位组编码
+    private String cCAComUnitCode="10";//成本默认计量单位编码，如果没有辅计量单位，为空
+    private String cPlanMethod="R";//计划方法
+    private String cSRPolicy="PE";//供需政策
+    private Integer fConvertRate=1;
 
 
-    private String cInvCode;//存货编码
+
+    private String cInvCode="asdg";//存货编码
     private String cInvAddCode;//存货代码
-    private String cGroupCode;//计量单位组编码
     private String cShopUnit;//零售计量单位 ，如果没有辅计量单位，为空
     private String cInvDepCode;//生产部门
     private String cValueType;//计价方式
     private String dSDate; //启用日期
-    private String cSRPolicy;//供需政策
-    private String cPlanMethod;//计划方法
     private String dInvCreateDatetime;//建档日期
     private String cModifyPerson;//变更人
     private String dModifyDate;//变更日期
@@ -34,7 +37,6 @@ public class Inventory implements Serializable {
     private Integer cPUComUnitCode;//采购默认计量单位编码 ，如果没有辅计量单位，为空
     private Integer cSAComUnitCode;//销售默认计量单位编码 ，如果没有辅计量单位，为空
     private Integer cSTComUnitCode;//库存默认计量单位编码 ，如果没有辅计量单位，为空
-    private String cCAComUnitCode;//成本默认计量单位编码，如果没有辅计量单位，为空
     private Integer iDrawType;//领料方式 ，直接领料为 0
     private Integer iSupplyType;//供应类型 ，领用 为0
     private boolean bInvBatch;//是否批次管理

platform-service/src/main/java/com/platform/service/longyanpurchaseorder/impl/LongYanPurchaseOrderServiceImpl.java

@@ -244,38 +244,6 @@ public class LongYanPurchaseOrderServiceImpl extends BaseServiceImpl<LongYanPurc
         });
 
         longYanPurchaseDetailMapper.insertListforComplex(BeanConverterUtil.copyListProperties(detailDTOS, LongYanPurchaseDetail.class));
-        List<String> sbIds = new ArrayList<>();
-            SbInfo sbInfo = sbInfoMapper.selectByPrimaryKey(model.getSbId());
-            SbInfoDTO queryDto = new SbInfoDTO();
-            if (sbInfo.getModel()!=null && !sbInfo.getModel().trim().equals("") &&!sbInfo.getModel().equals("暂无")) {
-                queryDto.setModel(sbInfo.getModel());
-                List<SbInfoVO> sbInfoVOS = sbInfoMapper.selectVOList(queryDto);
-                sbIds = sbInfoVOS.stream().map(SbInfoVO::getId).collect(Collectors.toList());
-                SbModelSpareBomDTO sbModelSpareBomDTO = new SbModelSpareBomDTO();
-
-//        sbModelSpareBomDTO.setSbIds(sbIds);
-                List<SbModelSpareBomVO> bomVOS = sbModelSpareBomMapper.selectVOList(sbModelSpareBomDTO);
-                List<String> spareIds = detailDTOS.stream().map(LongYanPurchaseDetailDTO::getSpareId).collect(Collectors.toList());
-                SbModelSpareBomDTO dto = new SbModelSpareBomDTO();
-                dto.setSpareIds(spareIds);
-                dto.setSbIds(sbIds);
-//                List<SbModelSpareBomVO> sbModelSpareBomVOS = sbModelSpareBomMapper.selectVOList(dto);
-                Weekend<SbModelSpareBom> weekend = new Weekend(SbModelSpareBom.class);
-                WeekendCriteria<SbModelSpareBom,Object> weekendCriteria = weekend.weekendCriteria();
-                weekendCriteria.andIn(SbModelSpareBom::getSpareId,spareIds);
-                weekendCriteria.andIn(SbModelSpareBom::getSbId,sbIds);
-                sbModelSpareBomMapper.deleteByExample(weekend);
-                List<SbModelSpareBom> boms = new ArrayList<>();
-                for (String sbId:sbIds){
-                    for (LongYanPurchaseDetailDTO detailDTO:detailDTOS){
-                        packageBom(boms,detailDTO,sbId);
-                    }
-                }
-                if (boms!=null && boms.size()>0){
-                    sbModelSpareBomMapper.insertListforComplex(boms);
-                }
-            }
-
 
 
 //        List<SbModelSpareBom> boms = new ArrayList<>();
@@ -301,18 +269,9 @@ public class LongYanPurchaseOrderServiceImpl extends BaseServiceImpl<LongYanPurc
         return order;
     }
 
-    private void packageBom(List<SbModelSpareBom> boms, LongYanPurchaseDetailDTO detailDTO,String sbId){
-        SbModelSpareBom sbModelSpareBom = new SbModelSpareBom();
-        sbModelSpareBom.setSpareId(detailDTO.getSpareId());
-        sbModelSpareBom.setSbId(sbId);
-        sbModelSpareBom.setNum(new BigDecimal(1));
-        sbModelSpareBom.setId(IdGeneratorUtils.getObjectId());
-        sbModelSpareBom.setGgxh(detailDTO.getGgxh());
-        sbModelSpareBom.setSpareName(detailDTO.getSpareName());
-        sbModelSpareBom.setModelId(sbId);
-        sbModelSpareBom.setNo(detailDTO.getNo());
-        boms.add(sbModelSpareBom);
-        }
+
+
+
 
     @Override
     public List<LongYanPurchaseOrderReportVO> getPurchaseReport(LongYanPurchaseOrderDTO dto) {

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -12,6 +12,8 @@ import com.platform.common.util.*;
 import com.platform.dao.bean.MyVOPage;
 import com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseDetailDTO;
 import com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseOrderDTO;
+import com.platform.dao.dto.sb.SbInfoDTO;
+import com.platform.dao.dto.sb.SbModelSpareBomDTO;
 import com.platform.dao.dto.spareAdd.Inventory;
 import com.platform.dao.dto.spareAdd.InventoryTest;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
@@ -39,6 +41,8 @@ import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
 import com.platform.dao.vo.query.store.OutStoreDetailVO;
 import com.platform.dao.vo.query.store.OutStoreFormVO;
 import com.platform.dao.vo.query.store.SpareStoreVO;
+import com.platform.dao.vo.sb.SbInfoVO;
+import com.platform.dao.vo.sb.SbModelSpareBomVO;
 import com.platform.service.store.OutStoreDetailService;
 import com.platform.service.store.OutStoreFormService;
 import com.platform.service.yongyou.YongyouService;
@@ -48,6 +52,8 @@ import handler.yongyou.response.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.weekend.Weekend;
+import tk.mybatis.mapper.weekend.WeekendCriteria;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -434,7 +440,51 @@ public class YongyouServiceImpl implements YongyouService {
         return myVOPage;
     }
 
+    private void addBom(LongYanPurchaseOrderVO model, List<LongYanPurchaseDetailVO> detailVOS) {
+        List<String> sbIds = new ArrayList<>();
+        SbInfo sbInfo = sbInfoMapper.selectByPrimaryKey(model.getSbId());
+        SbInfoDTO queryDto = new SbInfoDTO();
+        if (sbInfo.getModel()!=null && !sbInfo.getModel().trim().equals("") &&!sbInfo.getModel().equals("暂无")) {
+            queryDto.setModel(sbInfo.getModel());
+            List<SbInfoVO> sbInfoVOS = sbInfoMapper.selectVOList(queryDto);
+            sbIds = sbInfoVOS.stream().map(SbInfoVO::getId).collect(Collectors.toList());
+            SbModelSpareBomDTO sbModelSpareBomDTO = new SbModelSpareBomDTO();
 
+//        sbModelSpareBomDTO.setSbIds(sbIds);
+            List<SbModelSpareBomVO> bomVOS = sbModelSpareBomMapper.selectVOList(sbModelSpareBomDTO);
+            List<String> spareIds = detailVOS.stream().map(LongYanPurchaseDetailVO::getSpareId).collect(Collectors.toList());
+            SbModelSpareBomDTO dto = new SbModelSpareBomDTO();
+            dto.setSpareIds(spareIds);
+            dto.setSbIds(sbIds);
+//                List<SbModelSpareBomVO> sbModelSpareBomVOS = sbModelSpareBomMapper.selectVOList(dto);
+            Weekend<SbModelSpareBom> weekend = new Weekend(SbModelSpareBom.class);
+            WeekendCriteria<SbModelSpareBom,Object> weekendCriteria = weekend.weekendCriteria();
+            weekendCriteria.andIn(SbModelSpareBom::getSpareId,spareIds);
+            weekendCriteria.andIn(SbModelSpareBom::getSbId,sbIds);
+            sbModelSpareBomMapper.deleteByExample(weekend);
+            List<SbModelSpareBom> boms = new ArrayList<>();
+            for (String sbId:sbIds){
+                for (LongYanPurchaseDetailVO detailDTO:detailVOS){
+                    packageBom(boms,detailDTO,sbId);
+                }
+            }
+            if (boms!=null && boms.size()>0){
+                sbModelSpareBomMapper.insertListforComplex(boms);
+            }
+        }
+    }
+    private void packageBom(List<SbModelSpareBom> boms, LongYanPurchaseDetailVO detailDTO,String sbId){
+        SbModelSpareBom sbModelSpareBom = new SbModelSpareBom();
+        sbModelSpareBom.setSpareId(detailDTO.getSpareId());
+        sbModelSpareBom.setSbId(sbId);
+        sbModelSpareBom.setNum(new BigDecimal(1));
+        sbModelSpareBom.setId(IdGeneratorUtils.getObjectId());
+        sbModelSpareBom.setGgxh(detailDTO.getGgxh());
+        sbModelSpareBom.setSpareName(detailDTO.getSpareName());
+        sbModelSpareBom.setModelId(sbId);
+        sbModelSpareBom.setNo(detailDTO.getNo());
+        boms.add(sbModelSpareBom);
+    }
 
     @Override
     public String pushPurchaseOrder(String id) {
@@ -451,6 +501,9 @@ public class YongyouServiceImpl implements YongyouService {
         LongYanPurchaseDetailDTO longYanPurchaseDetailDTO = new LongYanPurchaseDetailDTO();
         longYanPurchaseDetailDTO.setLongYangPurchaseOrderId(id);
         List<LongYanPurchaseDetailVO> detailVOS = longYanPurchaseDetailMapper.selectList(longYanPurchaseDetailDTO);
+
+        addBom(list.get(0),detailVOS);
+
         PuAppMain puAppMain = new PuAppMain();
 
         puAppMain.setCbustype(vo.getCbustype());
@@ -538,10 +591,10 @@ public class YongyouServiceImpl implements YongyouService {
         handler.setRequest(request);
         String responseStr = handler.handler();
         AddSpareResponse response = JSONObject.parseObject(responseStr, AddSpareResponse.class);
-        if (response.getErrcode()) {
+        if (response.getResult()) {
             longYanSpareAdd.setStatus(LongYanSpareAddStatusEnum.PUSHED.getValue());
             longYanSpareAddMapper.updateByPrimaryKeySelective(longYanSpareAdd);
-            return response.getErrmsg();
+            return response.getMsg();
         } else {
             throw new BusinessException("新增失败！");
         }
@@ -563,6 +616,7 @@ public class YongyouServiceImpl implements YongyouService {
             Inventory.setCComUnitCode(inventoryTest.getCestComUnitCode());
             Inventory.setCInvName(inventoryTest.getCestInvName());
             Inventory.setCInvStd(inventoryTest.getCestInvStd());
+            Inventory.setCInvCCode("01");
             AddSpareRequest request = new AddSpareRequest();
 
             UserInfo userInfo = SecurityUtils.getUserInfo();
@@ -584,10 +638,10 @@ public class YongyouServiceImpl implements YongyouService {
             handler.setRequest(request);
             String responseStr = handler.handler();
             AddSpareResponse response = JSONObject.parseObject(responseStr, AddSpareResponse.class);
-            if (response.getErrcode()) {
+            if (response.getResult()) {
                 longYanSpareAdd.setStatus(LongYanSpareAddStatusEnum.PUSHED.getValue());
                 longYanSpareAddMapper.updateByPrimaryKeySelective(longYanSpareAdd);
-                return response.getErrmsg();
+                return response.getMsg();
             } else {
                 throw new BusinessException("新增失败！");
             }

platform-service/src/main/java/handler/yongyou/response/AddSpareResponse.java

@@ -7,9 +7,8 @@ import lombok.Data;
  */
 @Data
 public class AddSpareResponse{
-    Boolean errcode;
-    String errmsg;
-    String id;
-    String tradeid;
+    Boolean result;
+    String msg;
+    String data;
 
 }