1 năm trước cách đây
mục cha
commit
df84d05c48

+ 2 - 0
platform-common/src/main/java/com/platform/common/yongyou/request/PuAppMain.java

@@ -7,6 +7,8 @@ import lombok.Data;
  */
 @Data
 public class PuAppMain{
+    private String cdepcode;//部门编码
+
     private String ddate;//请购日期
 
     private String ccode;//单据号

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

@@ -22,6 +22,9 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseOrderDTO extends BaseDTO implements Serializable {
+    private String cdepcode;//部门编码
+    private String cbustype;//业务类型
+
     private String yongYouId;
     private String storeName;
     private String storePosition;

+ 4 - 0
platform-dao/src/main/java/com/platform/dao/entity/longyanpurchaseorder/LongYanPurchaseOrder.java

@@ -22,6 +22,10 @@ import javax.persistence.Transient;
 @Accessors(chain = true)
 @Table(name = "t_long_yan_purchase_order")
 public class LongYanPurchaseOrder implements Serializable{
+    private String cdepcode;//部门编码
+
+    private String cbustype;//业务类型
+
     private String yongYouId;
 
     private String purchaseNo;

+ 4 - 0
platform-dao/src/main/java/com/platform/dao/vo/query/longyanpurchaseorder/LongYanPurchaseOrderVO.java

@@ -23,6 +23,10 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseOrderVO extends BaseVO implements Serializable{
+    private String cdepcode;//部门编码
+
+    private String cbustype;//业务类型
+
     private String yongYouId;
 
     private List<LongYanPurchaseDetailVO> detailVOS;

+ 2 - 2
platform-rest/src/main/java/com/platform/rest/controller/yongyou/YongyouController.java

@@ -81,8 +81,8 @@ public class YongyouController {
     }
 
     @SysLog("向用友推送采购单")
-    @PostMapping("/push/purchaseOrder")
-    public R pushPurchaseOrder(@RequestParam String id) {
+    @GetMapping("/push/purchaseOrder/{id}")
+    public R pushPurchaseOrder(@PathVariable String id) {
 //        yongyouService.addOutForm(id, false);
         return new R(yongyouService.pushPurchaseOrder(id));
     }

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

@@ -443,8 +443,8 @@ public class YongyouServiceImpl implements YongyouService {
         List<LongYanPurchaseDetailVO> detailVOS = longYanPurchaseDetailMapper.selectList(longYanPurchaseDetailDTO);
         PuAppMain puAppMain = new PuAppMain();
 
-        puAppMain.setCbustype("普通采购");
-
+        puAppMain.setCbustype(vo.getCbustype());
+        puAppMain.setCdepcode(vo.getCdepcode());
         puAppMain.setCcode(vo.getPurchaseNo());
         puAppMain.setCdefine1(DictCache.getLabelByValue("LONG_YAN_PURCHASE_TYPE",vo.getType()));
         puAppMain.setCdefine2(vo.getSbName());
@@ -456,14 +456,14 @@ public class YongyouServiceImpl implements YongyouService {
         for (LongYanPurchaseDetailVO orderVO:detailVOS){
             PuAppDetail detail = new PuAppDetail();
             detail.setCinvcode(orderVO.getNo());
-            detail.setIpertaxrate("税率");
+            detail.setIpertaxrate("0");
             detail.setFquantity(orderVO.getNum().intValue());
             detail.setDrequirdate(DateUtils.dateToString(LocalDateTime.now()));
 //            detail.setDrequirdate("需求日期");
             detail.setDarrivedate(DateUtils.dateToString(LocalDateTime.now()));
 //            detail.setDarrivedate("计划到货日期");
-            detail.setCexch_name("币");
-            detail.setIexchrate("汇率");
+            detail.setCexch_name("人名币");
+            detail.setIexchrate("1");
             detail.setIvouchrowno("行号");
             puAppDetails.add(detail);
         }