优化

platform-common/src/main/java/com/platform/common/enums/DictTypeEnum.java

@@ -37,6 +37,8 @@ public enum DictTypeEnum {
     THIRD_PARTY_YONGYOU_DELETEPURCHASEORDER("DELETEPURCHASEORDER", "删除请购单"),
     THIRD_PARTY_YONGYOU_GETPURCHASEDETAILLIST("GETPURCHASEDETAILLIST", "请购单详情报表查询"),
     THIRD_PARTY_YONGYOU_GETPURCHASEPRICE("GETPURCHASEPRICE", "获取最新采购单价"),
+    THIRD_PARTY_YONGYOU_GETPUSHPURCHASEORDERUPDATE("GETPUSHPURCHASEORDERUPDATE", "获取请购单修改信息"),
+
 
 
 

platform-dao/src/main/java/com/platform/dao/dto/sqarepartmanage/SparePartInfoDTO.java

@@ -27,6 +27,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SparePartInfoDTO extends BaseDTO implements Serializable {
+
     private Integer oldOrNew;
     /**
      * 是否专用备件

platform-dao/src/main/java/com/platform/dao/mapper/longyanpurchaseorder/LongYanPurchaseDetailMapper.java

@@ -5,6 +5,7 @@ import com.platform.dao.config.MyMapper;
 import com.platform.dao.entity.longyanpurchaseorder.LongYanPurchaseDetail;
 import com.platform.dao.vo.query.longyanpurchaseorder.LongYanPurchaseDetailVO;
 import com.platform.dao.vo.report.SpareChartsFifityVO;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 import java.util.List;
 
@@ -17,6 +18,7 @@ import java.util.List;
  */
 @Component
 public interface LongYanPurchaseDetailMapper extends MyMapper<LongYanPurchaseDetail> {
+    void  updateBatch(@Param("list") List<LongYanPurchaseDetail> list);
     List<LongYanPurchaseDetailVO> getDetails(LongYanPurchaseDetailDTO detailDTO);
     List<SpareChartsFifityVO> getSpareNumChartsFifity(LongYanPurchaseDetailDTO detailDTO);
     /**

platform-dao/src/main/resources/mapper/longyanpurchaseorder/LongYanPurchaseDetailMapper.xml

@@ -132,4 +132,29 @@ ORDER BY totalNum DESC
             and detail.no = #{item.no}
         </foreach>
     </update>
+
+    <update id="updateBatch" parameterType="java.util.List">
+        <foreach collection="list" open="(" close=")" separator="," item="item">
+            update t_long_yan_purchase_detail
+            <if test="iorisum!=null">
+                set iorisum = #{iorisum},
+            </if>
+            <if test="ipertaxrate!=null">
+                set ipertaxrate = #{ipertaxrate},
+            </if>
+             <if test="funitprice!=null">
+                 set funitprice = #{funitprice},
+             </if>
+             <if test="fmoney!=null">
+                 set fmoney = #{fmoney},
+             </if>
+             <if test="iexchrate!=null">
+                 set iexchrate = #{iexchrate},
+             </if>
+             <if test="num!=null">
+                 set num = #{num}
+             </if>
+             where no = #{no}
+        </foreach>
+    </update>
 </mapper>

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

@@ -94,6 +94,7 @@ public class YongyouController {
         return new R<>(yongyouService.selectPageList(spareStoreDTO, pageNum, pageSize));
     }
 
+
     /**
      * 获取测试请购物料数据
      * @param spareStoreDTO 备件查询条件DTO
@@ -134,6 +135,7 @@ public class YongyouController {
         return new R(yongyouService.getLongYanPurchaseDetailListVOs(detailDTO, pageNum, pageSize));
     }
 
+
     /**
      * 发起用友出库单
      * 推送实际出库数量和状态

platform-rest/src/main/java/com/platform/rest/task/LongYanPurchaseOrderTask.java

@@ -0,0 +1,31 @@
+package com.platform.rest.task;
+
+import com.platform.service.check.CheckJobService;
+import com.platform.service.longyanpurchaseorder.LongYanPurchaseOrderService;
+import com.platform.service.yongyou.YongyouService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 点巡检任务处理
+ * @Author liuyu
+ * @Date 2020-05-09 16:40:01
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Slf4j
+@Component("longYanPurchaseOrderTask")
+@AllArgsConstructor
+public class LongYanPurchaseOrderTask {
+    private YongyouService yongyouService;
+
+    /**
+     *
+     */
+    public void purchaseOrderUpdate () {
+        yongyouService.purchaseOrderUpdate();
+    }
+
+
+
+}

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

@@ -62,6 +62,8 @@ public class LongYanPurchaseOrderServiceImpl extends BaseServiceImpl<LongYanPurc
         super.deleteByPrimaryKey(id);
     }
 
+
+
     @Override
     public void updateStatus(String id, Integer status) {
         LongYanPurchaseOrder order = new LongYanPurchaseOrder();

platform-service/src/main/java/com/platform/service/yongyou/YongyouService.java

@@ -22,6 +22,7 @@ import java.util.List;
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface YongyouService {
+    void purchaseOrderUpdate();
     AbstractPageResultBean<LongYanPurchaseDetailListVO> getLongYanPurchaseDetailListVOs(LongYanPurchaseOrderDTO detailDTO, Integer pageNum, Integer pageSize);
     List<PurchasePriceVO> getPurchasePrice(List<String> codes,Integer isNew);
 
@@ -41,6 +42,7 @@ public interface YongyouService {
      */
     AbstractPageResultBean<SparePartInfoVO> selectPageList(SparePartInfoDTO record, int pageNum, int pageSize);
 
+
     AbstractPageResultBean<SpareStoreVO> selectPageListTest(SpareStoreDTO spareStoreDTO, int pageNum, int pageSize);
 
     /**

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

@@ -713,6 +713,8 @@ public class YongyouServiceImpl implements YongyouService {
         boms.add(sbModelSpareBom);
     }
 
+
+
     @Override
     public AbstractPageResultBean<LongYanPurchaseDetailListVO> getLongYanPurchaseDetailListVOs(LongYanPurchaseOrderDTO detailDTO, Integer pageNum, Integer pageSize) {
         GetLongYanPurchaseDetalListRequest request = new GetLongYanPurchaseDetalListRequest();
@@ -857,6 +859,100 @@ public class YongyouServiceImpl implements YongyouService {
         }
     }
 
+    @Override
+    public void purchaseOrderUpdate() {
+        //查询当天修改的所有单子
+        Date date = new Date();
+        String dateStr = DateUtils.dateToString(date)+" 00:00:00";
+        GetUpdatePurchaseOrderRequest getUpdatePurchaseOrderRequest = new GetUpdatePurchaseOrderRequest();
+        getUpdatePurchaseOrderRequest.setStrWhere("1=1 and cmodifytime >= "+dateStr );
+        //新厂
+        getUpdatePurchaseOrderRequest.setToken(geToken(1));
+        getUpdatePurchaseOrderRequest.setCAcc_ID(getCAccId2(1));
+        getUpdatePurchaseOrderRequest.setConn(getConn2(1));
+        GetPurchaseOrderUpdateHandler handler = new GetPurchaseOrderUpdateHandler();
+        handler.setRequest(getUpdatePurchaseOrderRequest);
+        String responseStr = handler.handler();
+        GetPurchaseOrderUpdateResponse response = JsonUtils.jsonToModel(responseStr,GetPurchaseOrderUpdateResponse.class);
+
+        //老厂
+        getUpdatePurchaseOrderRequest.setToken(geToken(2));
+        getUpdatePurchaseOrderRequest.setCAcc_ID(getCAccId2(2));
+        getUpdatePurchaseOrderRequest.setConn(getConn2(2));
+        GetPurchaseOrderUpdateHandler handler2 = new GetPurchaseOrderUpdateHandler();
+        handler2.setRequest(getUpdatePurchaseOrderRequest);
+        String responseStr2 = handler2.handler();
+        GetPurchaseOrderUpdateResponse response2 = JsonUtils.jsonToModel(responseStr2,GetPurchaseOrderUpdateResponse.class);
+
+
+        List<PuAppDetails> puAppDetails = new ArrayList<>();
+        if (response.getResult()){
+            List<PurchaseData> datas = response.getData();
+            if (datas!=null&&datas.size()>0){
+                for (PurchaseData data:datas){
+                    if (data!=null&&data.getPuAppDetail()!=null&&data.getPuAppDetail().size()>0){
+                        puAppDetails.addAll(data.getPuAppDetail());
+                    }
+                }
+            }
+        }
+        if (response2.getResult()){
+            List<PurchaseData> datas = response2.getData();
+            if (datas!=null&&datas.size()>0){
+                for (PurchaseData data:datas){
+                    if (data!=null&&data.getPuAppDetail()!=null&&data.getPuAppDetail().size()>0){
+                        puAppDetails.addAll(data.getPuAppDetail());
+                    }
+                }
+            }
+        }
+
+        if (puAppDetails!=null){
+            //修改
+            List<LongYanPurchaseDetail> list = new ArrayList<>();
+            for (PuAppDetails details:puAppDetails){
+                Boolean flag = false;
+                LongYanPurchaseDetail longYanPurchaseDetail = new LongYanPurchaseDetail();
+                if (details.getCinvcode()!=null){
+                    longYanPurchaseDetail.setNo(details.getCinvcode());
+                    if (details.getFmoney()!=null){
+                        longYanPurchaseDetail.setFmoney(details.getFmoney());
+                        flag = true;
+                    }
+                    if (details.getIpertaxrate()!=null){
+                        longYanPurchaseDetail.setIpertaxrate(details.getIpertaxrate());
+                        flag = true;
+                    }
+                    if (details.getFquantity()!=null){
+                        longYanPurchaseDetail.setNum(details.getFquantity());
+                        flag = true;
+                    }
+                    if (details.getFunitprice()!=null){
+                        longYanPurchaseDetail.setFunitprice(details.getFunitprice());
+                        flag = true;
+                    }
+                    if (details.getIorisum()!=null){
+                        longYanPurchaseDetail.setIorisum(details.getIorisum());
+                        flag = true;
+                    }
+                    if (details.getIexchrate()!=null){
+                        longYanPurchaseDetail.setIexchrate(details.getIexchrate());
+                        flag = true;
+                    }
+                    if (flag){
+                        list.add(longYanPurchaseDetail);
+                    }
+
+                }
+            }
+            if (list!=null){
+                longYanPurchaseDetailMapper.updateBatch(list);
+            }
+        }
+
+    }
+
+
     @Override
     public String pushPurchaseOrder(String id) {
         LongYanPurchaseOrderDTO dto = new LongYanPurchaseOrderDTO();
@@ -1277,6 +1373,7 @@ public class YongyouServiceImpl implements YongyouService {
         return myVOPage;
     }
 
+
     @Override
     public AbstractPageResultBean<SpareStoreVO> selectPageListTest(SpareStoreDTO record, int pageNum, int pageSize) {
         // 已生成情况，直接推送
@@ -1366,7 +1463,7 @@ public class YongyouServiceImpl implements YongyouService {
         }
         req.setPageNum(pageNum);
         req.setPageSize(pageSize);
-        StringBuffer whereStr = new StringBuffer(" 1=1 ");
+        StringBuffer whereStr = new StringBuffer(" 1=1 and dEDate IS NULL");
         // 仓库编码搜索
         if (StringUtils.isNotBlank(record.getStoreNo())) {
             whereStr.append(" and cDefWareHouse like '%" + record.getStoreNo() + "%' ");

platform-service/src/main/java/handler/yongyou/GetPurchaseOrderUpdateHandler.java

@@ -0,0 +1,38 @@
+package handler.yongyou;
+
+import com.platform.common.enums.DictTypeEnum;
+import com.platform.common.util.R;
+import handler.yongyou.request.AddSpareRequest;
+import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.FromYongYouBaseRequest;
+import handler.yongyou.response.BaseResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class GetPurchaseOrderUpdateHandler extends BaseRequestHandler{
+
+    public GetPurchaseOrderUpdateHandler(){
+        setServiceType(DictTypeEnum.THIRD_PARTY_YONGYOU_GETPUSHPURCHASEORDERUPDATE.getType());
+    }
+
+
+
+
+    @Override
+    public R successHandler(FromYongYouBaseRequest req, String reqStr) {
+        return null;
+    }
+
+    /**
+     * 获取分页数据
+     * @param req
+     * @param resp
+     */
+    @Override
+    public void successResponse(BaseRequest req, BaseResponse resp) {
+        AddSpareRequest request = (AddSpareRequest)req;
+//        AddSpareResponse response = (AddSpareResponse)resp;
+    }
+}

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

@@ -0,0 +1,9 @@
+package handler.yongyou.request;
+
+import lombok.Data;
+
+@Data
+public class GetUpdatePurchaseOrderRequest extends BaseRequest {
+    private String strWhere;
+
+}

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

@@ -0,0 +1,16 @@
+package handler.yongyou.response;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 现存量查询响应
+ */
+@Data
+public class GetPurchaseOrderUpdateResponse {
+    Boolean result;
+    String msg;
+    List<PurchaseData> data;
+
+}

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

@@ -0,0 +1,24 @@
+package handler.yongyou.response;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+@Data
+public class PuAppDetails {
+    String id;//主表id
+    String autoid;//子表id
+    String cinvcode;//存货编码
+            Double ipertaxrate;//税率
+            BigDecimal fquantity;//数量
+            Double funitprice;//无税单价
+            Double ftaxprice;//含税单价
+            Double fmoney;//金额
+    BigDecimal ioricost;//原币单价
+    BigDecimal ioritaxcost;//原币含税单价
+    BigDecimal iorimoney;//原币金额
+    BigDecimal ioritaxprice;//原币税额
+            Double iorisum;//原币价税合计
+    BigDecimal imoney;//本币金额
+    BigDecimal itaxprice;//本币税额
+            Double iexchrate;//汇率
+}

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

@@ -0,0 +1,6 @@
+package handler.yongyou.response;
+
+public class PuAppMains {
+    String ccode;//请购单号
+    String id;//主表id
+}

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

@@ -0,0 +1,10 @@
+package handler.yongyou.response;
+
+import lombok.Data;
+
+import java.util.List;
+@Data
+public class PurchaseData {
+    PuAppMains PuAppMain;
+    List<PuAppDetails> PuAppDetail;
+}