1 year ago
parent
commit
dadbdb8479

+ 2 - 0
platform-rest/src/main/java/com/platform/rest/controller/longyanpurchaseorder/LongYanPurchaseDetailController.java

@@ -1,5 +1,7 @@
 package com.platform.rest.controller.longyanpurchaseorder;
 
+import com.alibaba.fastjson.JSONArray;
+import com.google.gson.JsonArray;
 import com.platform.common.util.R;
 import com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseDetailDTO;
 import com.platform.dao.entity.longyanpurchaseorder.LongYanPurchaseDetail;

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

@@ -642,7 +642,10 @@ public class YongyouServiceImpl implements YongyouService {
         longYanPurchaseDetailDTO.setLongYangPurchaseOrderId(id);
         List<LongYanPurchaseDetailVO> detailVOS = longYanPurchaseDetailMapper.selectList(longYanPurchaseDetailDTO);
 
-        addBom(list.get(0),detailVOS);
+        if (vo.getSbId()!=null) {
+            addBom(vo,detailVOS);
+
+        }
 
         PuAppMain puAppMain = new PuAppMain();
 
@@ -650,8 +653,10 @@ public class YongyouServiceImpl implements YongyouService {
         puAppMain.setCdepcode(vo.getCdepcode());
         puAppMain.setCcode(vo.getPurchaseNo());
         puAppMain.setCdefine1(DictCache.getLabelByValue("LONG_YAN_PURCHASE_TYPE",vo.getType()));
-        SbInfo sbInfo = sbInfoMapper.selectByPrimaryKey(vo.getSbId());
-        puAppMain.setCdefine2(sbInfo.getPositionNo()+"-"+sbInfo.getName());
+        if (vo.getSbId()!=null) {
+            SbInfo sbInfo = sbInfoMapper.selectByPrimaryKey(vo.getSbId());
+            puAppMain.setCdefine2(sbInfo.getPositionNo() + "-" + sbInfo.getName());
+        }
         puAppMain.setCdefine11(vo.getRemark());
         puAppMain.setCmaker(vo.getCreatedUserName());
         puAppMain.setDdate(DateUtils.dateToString(vo.getCreatedTime()));