guarantee-lsq 1 жил өмнө
parent
commit
ba0c67ea6c

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

@@ -34,7 +34,7 @@ public class Inventory implements Serializable {
     private Integer cPUComUnitCode;//采购默认计量单位编码 ,如果没有辅计量单位,为空
     private Integer cSAComUnitCode;//销售默认计量单位编码 ,如果没有辅计量单位,为空
     private Integer cSTComUnitCode;//库存默认计量单位编码 ,如果没有辅计量单位,为空
-    private Integer cCAComUnitCode;//成本默认计量单位编码,如果没有辅计量单位,为空
+    private String cCAComUnitCode;//成本默认计量单位编码,如果没有辅计量单位,为空
     private Integer iDrawType;//领料方式 ,直接领料为 0
     private Integer iSupplyType;//供应类型 ,领用 为0
     private boolean bInvBatch;//是否批次管理

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

@@ -79,9 +79,7 @@ public class YongyouController {
     @SysLog("新增物料发起")
     @PostMapping("/add/spare/tokenType")
     public R addSpare(@RequestBody InventoryTest inventory) {
-        System.out.println("-------------------"+JsonUtils.objectToJson(inventory));
-        return new R();
-        //return new R<>(yongyouService.addSpare(inventory,1));
+        return new R<>(yongyouService.addSpare(inventory,inventory.getTokenType()));
     }
 
     @SysLog("向用友推送采购单")

+ 2 - 1
platform-service/src/main/java/com/platform/service/yongyou/YongyouService.java

@@ -3,6 +3,7 @@ package com.platform.service.yongyou;
 import com.alibaba.fastjson.JSONObject;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.dao.dto.spareAdd.Inventory;
+import com.platform.dao.dto.spareAdd.InventoryTest;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
 import com.platform.dao.dto.store.SpareStoreDTO;
 import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
@@ -17,7 +18,7 @@ import handler.yongyou.response.OtherOutAddResponse;
  */
 public interface YongyouService {
     String pushPurchaseOrder(String id);
-    String addSpare(Inventory inventory, Integer tokenType);
+    String addSpare(InventoryTest inventory, Integer tokenType);
 
     /**
      * 分页查询备件列表

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

@@ -13,6 +13,7 @@ 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.spareAdd.Inventory;
+import com.platform.dao.dto.spareAdd.InventoryTest;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
 import com.platform.dao.dto.store.SpareStoreDTO;
 import com.platform.dao.entity.longyanpurchaseorder.LongYanPurchaseOrder;
@@ -499,7 +500,12 @@ public class YongyouServiceImpl implements YongyouService {
     }
 
     @Override
-    public String addSpare(Inventory Inventory, Integer tokenType) {
+    public String addSpare(InventoryTest inventoryTest, Integer tokenType) {
+        Inventory Inventory = new Inventory();
+        Inventory.setCInvCCode(inventoryTest.getCestInvCode());
+        Inventory.setCCAComUnitCode(inventoryTest.getCestComUnitCode());
+        Inventory.setCInvName(inventoryTest.getCestInvName());
+        Inventory.setCInvStd(inventoryTest.getCestInvStd());
         AddSpareRequest request = new AddSpareRequest();
         UserInfo userInfo = SecurityUtils.getUserInfo();
         Inventory.setDInvCreateDatetime(DateUtils.dateToString(LocalDateTime.now()));