部门和角色

platform-dao/src/main/java/com/platform/dao/dto/longyanpurchaseorder/LongYanPurchaseOrderDTO.java

@@ -38,9 +38,6 @@ public class LongYanPurchaseOrderDTO extends BaseDTO implements Serializable {
     private String yongYouId;
     private String storeName;
     private String storePosition;
-//    private List<LongYanPurchaseDetailDTO> deleteDetails;
-//    private List<LongYanPurchaseDetailDTO> addDetails;
-//    private List<LongYanPurchaseDetailDTO> updateDetails;
     private String purchaseNo;
     private Integer status;
     private Integer oldOrNew;

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

@@ -20,6 +20,7 @@ import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
 import com.platform.dao.dto.store.SpareStoreDTO;
 import com.platform.dao.entity.longyanpurchaseorder.LongYanPurchaseDetail;
 import com.platform.dao.entity.longyanpurchaseorder.LongYanPurchaseOrder;
+import com.platform.dao.entity.project.Project;
 import com.platform.dao.entity.repair.RepairApplicationForm;
 import com.platform.dao.entity.sb.SbInfo;
 import com.platform.dao.entity.sb.SbModelSpareBom;
@@ -29,6 +30,7 @@ import com.platform.dao.entity.store.OutStoreForm;
 import com.platform.dao.enums.*;
 import com.platform.dao.mapper.longyanpurchaseorder.LongYanPurchaseDetailMapper;
 import com.platform.dao.mapper.longyanpurchaseorder.LongYanPurchaseOrderMapper;
+import com.platform.dao.mapper.project.ProjectMapper;
 import com.platform.dao.mapper.repair.RepairApplicationFormMapper;
 import com.platform.dao.mapper.sb.SbInfoMapper;
 import com.platform.dao.mapper.sb.SbModelSpareBomMapper;
@@ -89,6 +91,8 @@ public class YongyouServiceImpl implements YongyouService {
     private LongYanPurchaseDetailMapper longYanPurchaseDetailMapper;
     @Resource
     private LongYanSpareAddMapper longYanSpareAddMapper;
+    @Resource
+    private ProjectMapper projectMapper;
     private String token_key = "yongyou-token";
     private String Conn_key = "yongyou-Conn";
     private String cAcc_ID_key = "yongyou-cAcc_ID";
@@ -641,18 +645,21 @@ public class YongyouServiceImpl implements YongyouService {
         LongYanPurchaseDetailDTO longYanPurchaseDetailDTO = new LongYanPurchaseDetailDTO();
         longYanPurchaseDetailDTO.setLongYangPurchaseOrderId(id);
         List<LongYanPurchaseDetailVO> detailVOS = longYanPurchaseDetailMapper.selectList(longYanPurchaseDetailDTO);
-
         if (vo.getSbId()!=null) {
             addBom(vo,detailVOS);
-
         }
-
         PuAppMain puAppMain = new PuAppMain();
-
         puAppMain.setCbustype(vo.getCbustype());
         puAppMain.setCdepcode(vo.getCdepcode());
         puAppMain.setCcode(vo.getPurchaseNo());
         puAppMain.setCdefine1(DictCache.getLabelByValue("LONG_YAN_PURCHASE_TYPE",vo.getType()));
+        // 获取项目信息
+        if(StringUtils.isNotBlank(vo.getProjectId())){
+            String fzr = projectMapper.selectByPrimaryKey(vo.getProjectId()).getFzr();
+            if(!StringUtils.isBlank(fzr) && !"无".equals(fzr)){
+                puAppMain.setCdefine6(fzr);
+            }
+        }
         if (vo.getSbId()!=null) {
             SbInfo sbInfo = sbInfoMapper.selectByPrimaryKey(vo.getSbId());
             puAppMain.setCdefine2(sbInfo.getPositionNo() + "-" + sbInfo.getName());
@@ -665,19 +672,13 @@ public class YongyouServiceImpl implements YongyouService {
         for (LongYanPurchaseDetailVO orderVO:detailVOS){
             PuAppDetail detail = new PuAppDetail();
             detail.setCinvcode(orderVO.getNo());
-//            detail.setIpertaxrate("0");
             detail.setFquantity(orderVO.getNum().intValue());
-//            detail.setDrequirdate(DateUtils.dateToString(LocalDateTime.now()));
-//            detail.setDarrivedate(DateUtils.dateToString(LocalDateTime.now()));
             detail.setDrequirdate(vo.getNeedDate().toString());
             detail.setDarrivedate(vo.getPlanGetDate().toString());
             detail.setCitem_class(orderVO.getProjectNo());
             detail.setCitemname(orderVO.getProjectName());
             detail.setCitem_name(orderVO.getProjectSecondName());
             detail.setCitemcode(orderVO.getProjectSecondNo());
-//            detail.setCexch_name("人名币");
-//            detail.setIexchrate("1");
-//            detail.setIvouchrowno("136345431");
             puAppDetails.add(detail);
         }
         PuAppVouch puAppVouch = new PuAppVouch();

platform-service/src/main/java/handler/yongyou/request/PuAppMain.java

@@ -20,9 +20,12 @@ public class PuAppMain{
     private String cmaker;//制单人
 
     private String cdefine1;//计划类型
+
     private String cdefine2;//设备
 
     private String cdefine11;//计划备注
 
+    private String cdefine6; // 项目负责人
+
 
 }