优化

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

@@ -10,6 +10,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.LocalDate;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -22,6 +23,10 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseOrderDTO extends BaseDTO implements Serializable {
+    private LocalDate needDate;//需求日期
+
+    private LocalDate planGetDate;//计划到货日期
+
     private String cptcode;//采购类型
 
     private String cdepcode;//部门编码

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

@@ -1,5 +1,6 @@
 package com.platform.dao.dto.spareAdd;
 
+import com.platform.common.util.IdGeneratorUtils;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -7,19 +8,21 @@ import java.io.Serializable;
 
 @Data
 public class Inventory implements Serializable {
-    private String cInvCCode="1";//存货分类编码
+    private String cInvCCode;//存货分类编码
     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 cGroupCode;//计量单位组编码
+    private String cCAComUnitCode;//成本默认计量单位编码，如果没有辅计量单位，为空
+    private String cPlanMethod;//计划方法
+    private String cSRPolicy;//供需政策
+    private Integer fConvertRate;
 
 
 
-    private String cInvCode="asdg";//存货编码
+//    private String cInvCode= IdGeneratorUtils.getObjectId();//存货编码
+    private String cInvCode;//存货编码
+
     private String cInvAddCode;//存货代码
     private String cShopUnit;//零售计量单位 ，如果没有辅计量单位，为空
     private String cInvDepCode;//生产部门

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

@@ -17,6 +17,12 @@ public class InventoryTest extends BaseDTO implements Serializable {
     private String cestInvStd;//规格型号
     private Integer tokenType;
 
+    private String cestCaComUnitCode;//成本默认计量单位编码，如果没有辅计量单位，为空
+    private String cestPlanMethod;//计划方法
+    private String cestSrpolicy;//供需政策
+    private Integer cestFconvertRate;
+    private String cestGroupCode;//计量单位组编码
+
 
 
 }

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

@@ -8,6 +8,8 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.LocalDate;
+import java.util.Date;
+
 import lombok.experimental.Accessors;
 import com.platform.common.bean.DataScope;
 import javax.persistence.Transient;
@@ -22,6 +24,10 @@ import javax.persistence.Transient;
 @Accessors(chain = true)
 @Table(name = "t_long_yan_purchase_order")
 public class LongYanPurchaseOrder implements Serializable{
+    private LocalDate needDate;//需求日期
+
+    private LocalDate planGetDate;//计划到货日期
+
     private String cptcode;//采购类型
     private String cdepcode;//部门编码
 

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

@@ -11,6 +11,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.LocalDate;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -23,6 +24,10 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseOrderVO extends BaseVO implements Serializable{
+    private LocalDate needDate;//需求日期
+
+    private LocalDate planGetDate;//计划到货日期
+
     private String cptcode;//采购类型
 
     private String cdepcode;//部门编码

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

@@ -514,20 +514,20 @@ public class YongyouServiceImpl implements YongyouService {
         puAppMain.setCdefine11(vo.getRemark());
         puAppMain.setCmaker(vo.getCreatedUserName());
         puAppMain.setDdate(DateUtils.dateToString(vo.getCreatedTime()));
-        puAppMain.setCptcode(DictCache.getLabelByValue("LONG_YAN_PURCHASE_TYPE",vo.getType()));
+        puAppMain.setCptcode(vo.getCptcode());
         List<PuAppDetail> puAppDetails = new ArrayList<>();
         for (LongYanPurchaseDetailVO orderVO:detailVOS){
             PuAppDetail detail = new PuAppDetail();
             detail.setCinvcode(orderVO.getNo());
-            detail.setIpertaxrate("0");
+//            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("1");
-            detail.setIvouchrowno("行号");
+//            detail.setDrequirdate(DateUtils.dateToString(LocalDateTime.now()));
+//            detail.setDarrivedate(DateUtils.dateToString(LocalDateTime.now()));
+            detail.setDrequirdate(vo.getNeedDate().toString());
+            detail.setDarrivedate(vo.getPlanGetDate().toString());
+//            detail.setCexch_name("人名币");
+//            detail.setIexchrate("1");
+//            detail.setIvouchrowno("136345431");
             puAppDetails.add(detail);
         }
         PuAppVouch puAppVouch = new PuAppVouch();
@@ -545,11 +545,11 @@ public class YongyouServiceImpl implements YongyouService {
         PushPurchaseOrderResponse response = JsonUtils.jsonToModel(responseStr,PushPurchaseOrderResponse.class);
         LongYanPurchaseOrder order = new LongYanPurchaseOrder();
         order.setId(id);
-        if (response.getErrcode()){
+        if (response.getResult()){
             order.setStatus(3);
+            order.setYongYouId(response.getData());
             longYanPurchaseOrderMapper.updateByPrimaryKeySelective(order);
-            order.setYongYouId(response.getId());
-            return response.getErrmsg();
+            return response.getMsg();
         }
         order.setStatus(8);
         longYanPurchaseOrderMapper.updateByPrimaryKeySelective(order);
@@ -616,7 +616,14 @@ public class YongyouServiceImpl implements YongyouService {
             Inventory.setCComUnitCode(inventoryTest.getCestComUnitCode());
             Inventory.setCInvName(inventoryTest.getCestInvName());
             Inventory.setCInvStd(inventoryTest.getCestInvStd());
-            Inventory.setCInvCCode("01");
+            Inventory.setCInvCCode(inventoryTest.getCestInvCode());
+
+            Inventory.setCInvCode(IdGeneratorUtils.getObjectId());
+            Inventory.setCGroupCode("1");
+            Inventory.setCCAComUnitCode(inventoryTest.getCestComUnitCode());
+            Inventory.setCPlanMethod(inventoryTest.getCestPlanMethod());
+            Inventory.setCSRPolicy(inventoryTest.getCestSrpolicy());
+            Inventory.setFConvertRate(1);
             AddSpareRequest request = new AddSpareRequest();
 
             UserInfo userInfo = SecurityUtils.getUserInfo();
@@ -642,13 +649,12 @@ public class YongyouServiceImpl implements YongyouService {
                 longYanSpareAdd.setStatus(LongYanSpareAddStatusEnum.PUSHED.getValue());
                 longYanSpareAddMapper.updateByPrimaryKeySelective(longYanSpareAdd);
                 return response.getMsg();
-            } else {
-                throw new BusinessException("新增失败！");
             }
         }catch (Exception e){
             longYanSpareAdd.setStatus(LongYanSpareAddStatusEnum.FAIL_PUSH.getValue());
             longYanSpareAddMapper.updateByPrimaryKeySelective(longYanSpareAdd);
             e.printStackTrace();
+            throw new BusinessException("新增失败！");
         }
         return null;
     }

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

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