před 1 rokem
rodič
revize
8154f548f9

+ 12 - 0
platform-common/src/main/java/com/platform/common/yongyou/request/Inventory.java

@@ -43,4 +43,16 @@ public class Inventory {
     private String dModifyDate;//变更日期
     @JSONField(name="cInvDefine1")
     private String cInvDefine1;//存货自定义项1
+
+    @JSONField(name="bSale")
+    private boolean bSale;//是否销售
+
+    @JSONField(name="bSelf")
+    private boolean bSelf;//是否自制
+
+    @JSONField(name="bComsume")
+    private boolean bComsume;//是否生产耗用
+
+    @JSONField(name="iGroupType")
+    private Integer iGroupType;//计量单位组类别 ,无换算率 为 0 ,固定换算率为 1
 }

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

@@ -77,6 +77,7 @@ public class YongyouController {
     @PutMapping("/add/spare")
     public R addSpare(Inventory inventory) {
 //        yongyouService.addOutForm(id, false);
+        yongyouService.addSpare(inventory);
         return new R<>();
     }
 

+ 2 - 1
platform-service/src/main/java/com/platform/service/longyanpurchaseorder/impl/LongYanPurchaseOrderServiceImpl.java

@@ -162,9 +162,9 @@ public class LongYanPurchaseOrderServiceImpl extends BaseServiceImpl<LongYanPurc
         LongYanPurchaseDetail detail = new LongYanPurchaseDetail();
         detail.setLongYangPurchaseOrderId(order.getId());
         longYanPurchaseDetailMapper.delete(detail);
+        BigDecimal totalNum = new BigDecimal(0);
         List<LongYanPurchaseDetailDTO> detailDTOS = model.getDetailDTOS();
         if (detailDTOS!=null&&detailDTOS.size()>0) {
-            BigDecimal totalNum = new BigDecimal(0);
                 for (LongYanPurchaseDetailDTO item:detailDTOS) {
                     item.setId(IdGeneratorUtils.getObjectId());
                     item.setLongYangPurchaseOrderId(model.getId());
@@ -178,6 +178,7 @@ public class LongYanPurchaseOrderServiceImpl extends BaseServiceImpl<LongYanPurc
                 }
             longYanPurchaseDetailMapper.insertListforComplex(BeanConverterUtil.copyListProperties(detailDTOS,LongYanPurchaseDetail.class));
         }
+        order.setTotalNum(totalNum);
         mapper.updateByPrimaryKeySelective(order);
 
     }

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

@@ -2,6 +2,7 @@ package com.platform.service.yongyou;
 
 import com.alibaba.fastjson.JSONObject;
 import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.common.yongyou.request.Inventory;
 import com.platform.common.yongyou.response.OtherOutAddResponse;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
 import com.platform.dao.dto.store.SparePickFormDTO;
@@ -23,6 +24,7 @@ import java.util.List;
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface YongyouService {
+    void addSpare(Inventory inventory);
 
     /**
      * 分页查询备件列表

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

@@ -364,6 +364,11 @@ public class YongyouServiceImpl implements YongyouService {
         return myVOPage;
     }
 
+    @Override
+    public void addSpare(Inventory inventory) {
+
+    }
+
     /**
      * 查询物资分页
      *