feat: 设备优化

src/main/java/com/glxp/api/controller/purchase/PurContractController.java

@@ -85,5 +85,19 @@ public class PurContractController {
     }
 
 
+    /**
+     * 审核采购合同
+     */
+    @RepeatSubmit()
+    @PostMapping("/purchase/contract/auditOrder")
+    public BaseResponse auditOrder(@RequestBody PurContractRequest purContractRequest) {
+        String code = purContractRequest.getCode();
+        Integer status = purContractRequest.getStatus();
+        if (StringUtil.isEmpty(code) || status == null){
+            return ResultVOUtils.error(999, "参数有误！");
+        }
+        boolean b = purContractService.auditOrder(purContractRequest);
+        return ResultVOUtils.success("更新成功！");
+    }
 
 }

src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java

@@ -121,6 +121,25 @@ public class PurApplyEntity {
     @TableField(value = "generatePlan")
     private boolean generatePlan;
 
+
+    @TableField(value = "emergency")
+    private Integer emergency;
+
+    /**
+     * 是否已生成采购计划
+     */
+    @TableField(value = "arrivalTime")
+    private Date arrivalTime;
+
+    /**
+     * 审批表主键
+     */
+    @TableField(value = "approvalFlowId")
+    private String approvalFlowId;
+
+    @TableField(value = "pageType")
+    private Integer pageType;
+
     public static final String COL_ID = "id";
 
     public static final String COL_BILLNO = "billNo";
@@ -158,4 +177,4 @@ public class PurApplyEntity {
     public static final String COL_PLANBILLNO = "planBillNo";
 
     public static final String COL_GENERATEPLAN = "generatePlan";
-}
+}

src/main/java/com/glxp/api/service/purchase/impl/PurContractDetailService.java

@@ -2,6 +2,7 @@ package com.glxp.api.service.purchase.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,15 +11,19 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.dao.basic.UdiRlSupDao;
 import com.glxp.api.dao.purchase.PurContractDetailMapper;
 import com.glxp.api.entity.purchase.PurContractDetailEntity;
+import com.glxp.api.entity.purchase.PurContractEntity;
 import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
 import com.glxp.api.req.purchase.PurContractDetailRequest;
+import com.glxp.api.req.purchase.PurContractRequest;
 import com.glxp.api.res.basic.UdiRlSupResponse;
+import com.glxp.api.service.auth.CustomerService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -28,6 +33,8 @@ public class PurContractDetailService extends ServiceImpl<PurContractDetailMappe
     PurContractDetailMapper purContractDetailMapper;
     @Resource
     UdiRlSupDao udiRlSupDao;
+    @Resource
+    CustomerService customerService;
 
 
     public IPage<PurContractDetailEntity> queryPageList(PurContractDetailRequest purContractDetailRequest) {

src/main/java/com/glxp/api/service/purchase/impl/PurContractService.java

@@ -30,6 +30,8 @@ public class PurContractService extends ServiceImpl<PurContractMapper, PurContra
 
     @Resource
     PurContractMapper purContractMapper;
+    @Resource
+    CustomerService customerService;
 
     public List<PurContractEntityResponse> queryPageList(PurContractRequest purContractRequest) {
         if (purContractRequest == null) {
@@ -43,4 +45,14 @@ public class PurContractService extends ServiceImpl<PurContractMapper, PurContra
         return data;
     }
 
+
+    public boolean auditOrder(PurContractRequest purContractRequest) {
+        Long userId = customerService.getUserId();
+        String code = purContractRequest.getCode();
+        PurContractEntity one = super.getOne(new LambdaQueryWrapper<>(PurContractEntity.class).eq(PurContractEntity::getCode, code));
+        one.setUpdateTime(new Date());
+        one.setUpdateUser(userId + "");
+        one.setStatus(purContractRequest.getStatus());
+        return super.updateById(one);
+    }
 }

src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java

@@ -13,6 +13,8 @@ import com.glxp.api.constant.*;
 import com.glxp.api.controller.sync.SpsSyncWebSocket;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.dao.basic.BasicProductsDao;
+import com.glxp.api.dao.purchase.PurApplyDao;
+import com.glxp.api.dao.purchase.PurContractMapper;
 import com.glxp.api.entity.basic.*;
 import com.glxp.api.entity.dev.*;
 import com.glxp.api.entity.inout.*;
@@ -50,6 +52,7 @@ import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
@@ -97,6 +100,10 @@ public class SpsSyncDownloadService {
 
     @Resource
     IoOrderInvoiceService orderInvoiceService;
+    @Autowired
+    private PurApplyDao purApplyDao;
+    @Autowired
+    private PurContractMapper purContractMapper;
 
 
     //    创建单据同步任务
@@ -810,17 +817,28 @@ public class SpsSyncDownloadService {
                 }
             }
 
-            //todo 合同实体
-//            List<DeviceCheckDetailEntity> deviceCheckDetailEntities = deviceCheckDetailService.list(Wrappers.lambdaQuery(DeviceCheckDetailEntity.class)
-//                    .le(!ge && (boolean) map.get("isNew"), DeviceCheckDetailEntity::getUpdateTime, now)
-//                    .between(ge, DeviceCheckDetailEntity::getUpdateTime, syncTime, now)
-//                    .between(!ge && !(boolean) map.get("isNew"), DeviceCheckDetailEntity::getUpdateTime
-//                            , map.get("oldDate"), now)
-//            );
-//            if (CollectionUtil.isNotEmpty(deviceCheckDetailEntities)) {
-//                remark.append("合同:").append(deviceCheckDetailEntities.size()).append("条\n");
-//                jsonMap.put(DeviceCheckDetailEntity.class.getSimpleName(), deviceCheckDetailEntities);
-//            }
+
+            List<PurApplyEntity> purApplyEntities = purApplyDao.selectList(Wrappers.lambdaQuery(PurApplyEntity.class)
+                    .le(!ge && (boolean) map.get("isNew"), PurApplyEntity::getUpdateTime, now)
+                    .between(ge, PurApplyEntity::getUpdateTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), PurApplyEntity::getUpdateTime
+                            , map.get("oldDate"), now)
+            );
+            if (CollectionUtil.isNotEmpty(purApplyEntities)) {
+                remark.append("设备申购明细:").append(purApplyEntities.size()).append("条\n");
+                jsonMap.put(PurApplyEntity.class.getSimpleName(), purApplyEntities);
+            }
+
+            List<PurContractEntity> purContractEntities = purContractMapper.selectList(Wrappers.lambdaQuery(PurContractEntity.class)
+                    .le(!ge && (boolean) map.get("isNew"), PurContractEntity::getUpdateTime, now)
+                    .between(ge, PurContractEntity::getUpdateTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), PurContractEntity::getUpdateTime
+                            , map.get("oldDate"), now)
+            );
+            if (CollectionUtil.isNotEmpty(purContractEntities)) {
+                remark.append("设备合同明细:").append(purContractEntities.size()).append("条\n");
+                jsonMap.put(PurContractEntity.class.getSimpleName(), purContractEntities);
+            }
 
             if (jsonMap.size() > 0) {
                 jsonMap.put(SYNC_REMARK, remark.toString());