投递单审核

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/RecycleDeliveryOrderMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="jnpf.mapper.RecycleCleanOrderMapper">
+
+    <update id="auditBatch">
+        UPDATE NX_RECYCLE_DELIVERY_ORDER
+        SET
+        ADJUST_WEIGHT = REPORT_WEIGHT,
+        ADJUST_PRICE = TOTAL_PRICE,
+        ADJUST_STATUS = #{batch.adjustStatus},
+        ADJUST_COMM = #{batch.adjustComm},
+        F_LAST_MODIFY_TIME = #{batch.lastModifyTime},
+        F_LAST_MODIFY_USER_ID = #{batch.lastModifyUserId}
+        WHERE ID IN
+        <foreach collection="batch.ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+</mapper>

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleDeliveryOrderMapper.java

@@ -3,6 +3,8 @@ package jnpf.mapper;
 
 import jnpf.entity.RecycleDeliveryOrderEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import jnpf.model.recycledeliveryorder.DeliveryAuditBatch;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 投递清单
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface RecycleDeliveryOrderMapper extends BaseMapper<RecycleDeliveryOrderEntity> {
 
+    int auditBatch(@Param("bacth") DeliveryAuditBatch batch);
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleDeliveryOrderService.java

@@ -2,7 +2,9 @@ package jnpf.service;
 
 import jnpf.model.recycledeliveryorder.*;
 import jnpf.entity.*;
+
 import java.util.*;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
@@ -32,4 +34,10 @@ public interface RecycleDeliveryOrderService extends IService<RecycleDeliveryOrd
 
     void saveOrUpdate(RecycleDeliveryOrderForm recycleDeliveryOrderForm, String id, boolean isSave) throws Exception;
 
+    //审核
+    boolean audit(DeliveryAuditForm form);
+
+    //批量审核
+    int batchAudit(DeliveryAuditBatch batch);
+
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java

@@ -1,37 +1,37 @@
 package jnpf.service.impl;
 
-import jnpf.entity.*;
-import jnpf.mapper.RecycleDeliveryOrderMapper;
-import jnpf.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import jnpf.model.recycledeliveryorder.*;
-import java.math.BigDecimal;
 import cn.hutool.core.util.ObjectUtil;
-import jnpf.permission.model.authorize.AuthorizeConditionModel;
-import jnpf.util.GeneraterSwapUtil;
-import jnpf.database.model.superQuery.SuperQueryJsonModel;
-import jnpf.database.model.superQuery.ConditionJsonModel;
-import jnpf.database.model.superQuery.SuperQueryConditionModel;
-import java.lang.reflect.Field;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.util.regex.Pattern;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import jnpf.model.QueryModel;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import java.util.stream.Collectors;
-import jnpf.base.model.ColumnDataModel;
-import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import jnpf.database.model.superQuery.SuperJsonModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import java.text.SimpleDateFormat;
-import jnpf.util.*;
-import java.util.*;
 import jnpf.base.UserInfo;
+import jnpf.base.model.ColumnDataModel;
+import jnpf.database.model.superQuery.SuperJsonModel;
+import jnpf.entity.RecycleCleanOrderEntity;
+import jnpf.entity.RecycleDeliveryOrderEntity;
+import jnpf.mapper.RecycleDeliveryOrderMapper;
+import jnpf.model.QueryModel;
+import jnpf.model.recycledeliveryorder.*;
 import jnpf.permission.entity.UserEntity;
+import jnpf.service.RecycleDeliveryOrderService;
+import jnpf.util.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.lang.reflect.Field;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
 /**
- *
  * 投递清单
  * 版本： V3.5
  * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@@ -45,12 +45,17 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
 
     @Autowired
     private UserProvider userProvider;
+    @Resource
+    private RecycleDeliveryOrderMapper deliveryOrderMapper;
 
     @Override
     public List<RecycleDeliveryOrderEntity> getList(RecycleDeliveryOrderPagination recycleDeliveryOrderPagination) {
         return getTypeList(recycleDeliveryOrderPagination, recycleDeliveryOrderPagination.getDataType());
     }
-    /** 列表查询 */
+
+    /**
+     * 列表查询
+     */
     @Override
     public List<RecycleDeliveryOrderEntity> getTypeList(RecycleDeliveryOrderPagination recycleDeliveryOrderPagination, String dataType) {
         String userId = userProvider.get().getUserId();
@@ -379,27 +384,34 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
             return this.list(recycleDeliveryOrderQueryWrapper);
         }
     }
+
     @Override
     public RecycleDeliveryOrderEntity getInfo(String id) {
         QueryWrapper<RecycleDeliveryOrderEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(RecycleDeliveryOrderEntity::getId, id);
         return this.getOne(queryWrapper);
     }
+
     @Override
     public void create(RecycleDeliveryOrderEntity entity) {
         this.save(entity);
     }
+
     @Override
     public boolean update(String id, RecycleDeliveryOrderEntity entity) {
         return this.updateById(entity);
     }
+
     @Override
     public void delete(RecycleDeliveryOrderEntity entity) {
         if (entity != null) {
             this.removeById(entity.getId());
         }
     }
-    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+
+    /**
+     * 验证表单唯一字段，正则，非空 i-0新增-1修改
+     */
     @Override
     public String checkForm(RecycleDeliveryOrderForm form, int i) {
         boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
@@ -460,8 +472,10 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
         }
         return countRecover;
     }
+
     /**
      * 新增修改数据(事务回滚)
+     *
      * @param id
      * @param recycleDeliveryOrderForm
      * @return
@@ -497,4 +511,32 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
         this.saveOrUpdate(entity);
 
     }
+
+    @Override
+    @Transactional
+    public boolean audit(DeliveryAuditForm form) {
+        UserInfo userInfo = userProvider.get();
+        form.setLastModifyUserId(userInfo.getUserId());
+        form.setLastModifyTime(LocalDateTime.now());
+        UpdateWrapper<RecycleDeliveryOrderEntity> wrapper = new UpdateWrapper<>();
+        wrapper.lambda()
+                .set(RecycleDeliveryOrderEntity::getAdjustStatus, form.getAdjustStatus())
+                .set(RecycleDeliveryOrderEntity::getAdjustWeight, form.getAdjustWeight())
+                .set(RecycleDeliveryOrderEntity::getAdjustPrice, form.getAdjustPrice())
+                .set(RecycleDeliveryOrderEntity::getAdjustComm, form.getAdjustComm())
+                .set(RecycleDeliveryOrderEntity::getLastModifyUserId, form.getLastModifyUserId())
+                .set(RecycleDeliveryOrderEntity::getLastModifyTime, form.getLastModifyTime())
+                .eq(RecycleDeliveryOrderEntity::getId, form.getId());
+        return this.update(wrapper);
+    }
+
+    @Override
+    @Transactional
+    public int batchAudit(DeliveryAuditBatch batch) {
+        UserInfo userInfo = userProvider.get();
+        batch.setLastModifyUserId(userInfo.getUserId());
+        batch.setLastModifyTime(LocalDateTime.now());
+        int update = deliveryOrderMapper.auditBatch(batch);
+        return update;
+    }
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleCleanOrderController.java

@@ -222,7 +222,7 @@ public class RecycleCleanOrderController {
      * @return
      */
     @Operation(summary = "批量审核")
-    @PostMapping("/audit")
+    @PostMapping("/auditBatch")
     public ActionResult AuditBatch(CleanAuditBatch batch) {
         int up = recycleCleanOrderService.auditBatch(batch);
         if (up > 0) return ActionResult.success("审核操作成功");

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeliveryOrderController.java

@@ -1,36 +1,31 @@
 package jnpf.controller;
 
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jnpf.base.ActionResult;
-import jnpf.base.UserInfo;
+import jnpf.base.vo.PageListVO;
-import jnpf.exception.DataException;
+import jnpf.base.vo.PaginationVO;
-import jnpf.permission.entity.UserEntity;
+import jnpf.entity.RecycleDeliveryOrderEntity;
-import jnpf.service.*;
-import jnpf.entity.*;
-import jnpf.util.*;
 import jnpf.model.recycledeliveryorder.*;
+import jnpf.service.RecycleDeliveryOrderService;
+import jnpf.util.GeneraterSwapUtil;
+import jnpf.util.JsonUtil;
+import jnpf.util.StringUtil;
+import jnpf.util.UserProvider;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.util.*;
-import jnpf.annotation.JnpfField;
-import jnpf.base.vo.PageListVO;
-import jnpf.base.vo.PaginationVO;
-import jnpf.base.vo.DownloadVO;
-import jnpf.config.ConfigValueUtil;
-import jnpf.base.entity.ProvinceEntity;
 import java.io.IOException;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
-import jnpf.engine.entity.FlowTaskEntity;
+import java.util.List;
-import jnpf.exception.WorkFlowException;
+import java.util.Map;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 投递清单
+ *
  * @版本： V3.5
  * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * @作者： JNPF开发平台组
@@ -52,7 +47,6 @@ public class RecycleDeliveryOrderController {
     private RecycleDeliveryOrderService recycleDeliveryOrderService;
 
 
-
     /**
      * 列表
      *
@@ -81,6 +75,7 @@ public class RecycleDeliveryOrderController {
         vo.setPagination(page);
         return ActionResult.success(vo);
     }
+
     /**
      * 创建
      *
@@ -101,8 +96,10 @@ public class RecycleDeliveryOrderController {
         }
         return ActionResult.success("创建成功");
     }
+
     /**
      * 编辑
+     *
      * @param id
      * @param recycleDeliveryOrderForm
      * @return
@@ -130,8 +127,10 @@ public class RecycleDeliveryOrderController {
             return ActionResult.fail("更新失败，数据不存在");
         }
     }
+
     /**
      * 删除
+     *
      * @param id
      * @return
      */
@@ -146,9 +145,11 @@ public class RecycleDeliveryOrderController {
         }
         return ActionResult.success("删除成功");
     }
+
     /**
      * 表单信息(详情页)
      * 详情页面使用-转换数据
+     *
      * @param id
      * @return
      */
@@ -166,9 +167,11 @@ public class RecycleDeliveryOrderController {
         recycleDeliveryOrderMap = generaterSwapUtil.swapDataDetail(recycleDeliveryOrderMap, RecycleDeliveryOrderConstant.getFormData(), "565540808741097605", false);
         return ActionResult.success(recycleDeliveryOrderMap);
     }
+
     /**
      * 获取详情(编辑页)
      * 编辑页面使用-不转换数据
+     *
      * @param id
      * @return
      */
@@ -187,4 +190,22 @@ public class RecycleDeliveryOrderController {
         return ActionResult.success(recycleDeliveryOrderMap);
     }
 
+    //审核
+    @Operation(summary = "审核")
+    @PostMapping("/audit")
+    public ActionResult audit(@RequestBody DeliveryAuditForm form) {
+        boolean audit = recycleDeliveryOrderService.audit(form);
+        if (audit) return ActionResult.success("审核成功");
+        else return ActionResult.fail("审核失败");
+    }
+
+    //批量审核
+    @Operation(summary = "审核")
+    @PostMapping("/auditBatch")
+    public ActionResult auditBatch(@RequestBody DeliveryAuditBatch batch) {
+        int update = recycleDeliveryOrderService.batchAudit(batch);
+        if (update <= 0) return ActionResult.fail("审核失败");
+        return ActionResult.success("审核成功");
+    }
+
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledeliveryorder/DeliveryAuditBatch.java

@@ -4,38 +4,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
 
 //审核表单
 @Data
 public class DeliveryAuditBatch {
 
     /** 主键 */
-    private String id;
+    private List<String> ids;
-    /** 清运单号 **/
+    @JsonProperty("adjustStatus")//审核状态
-    @JsonProperty("orderNo")
-    private String orderNo;
-    @JsonProperty("deviceOrderNo")
-    private String deviceOrderNo;
-    /** 单价 **/
-    @JsonProperty("price")
-    private BigDecimal price;
-    /** 清运重量 **/
-    @JsonProperty("weight")
-    private BigDecimal weight;
-    /** 总价 **/
-    @JsonProperty("totalPrice")
-    private BigDecimal totalPrice;
-    /** 审核后重量 **/
-    @JsonProperty("adjustWeight")
-    private BigDecimal adjustWeight;
-    /** 审核后总价 **/
-    @JsonProperty("reportTime")
-    private String reportTime;
-    /** 审核状态 **/
-    @JsonProperty("adjustStatus")
     private String adjustStatus;
-    /** 入库状态 **/
+    @JsonProperty("adjustComm")
-    @JsonProperty("entryStatus")
+    private String adjustComm;//审核备注
-    private String entryStatus;
+    @JsonProperty("lastModifyUserId")
-    /** 审核说明 **/
+    private String lastModifyUserId;
+    @JsonProperty("lastModifyTime")
+    private LocalDateTime lastModifyTime;
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledeliveryorder/DeliveryAuditForm.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 //审核表单
 @Data
@@ -11,31 +12,17 @@ public class DeliveryAuditForm {
 
     /** 主键 */
     private String id;
-    /** 清运单号 **/
+    @JsonProperty("adjustStatus")//审核状态
-    @JsonProperty("orderNo")
-    private String orderNo;
-    @JsonProperty("deviceOrderNo")
-    private String deviceOrderNo;
-    /** 单价 **/
-    @JsonProperty("price")
-    private BigDecimal price;
-    /** 清运重量 **/
-    @JsonProperty("weight")
-    private BigDecimal weight;
-    /** 总价 **/
-    @JsonProperty("totalPrice")
-    private BigDecimal totalPrice;
-    /** 审核后重量 **/
-    @JsonProperty("adjustWeight")
-    private BigDecimal adjustWeight;
-    /** 审核后总价 **/
-    @JsonProperty("reportTime")
-    private String reportTime;
-    /** 审核状态 **/
-    @JsonProperty("adjustStatus")
     private String adjustStatus;
-    /** 入库状态 **/
+    @JsonProperty("adjustWeight")//审核重量
-    @JsonProperty("entryStatus")
+    private BigDecimal adjustWeight;
-    private String entryStatus;
+    @JsonProperty("adjustPrice")
-    /** 审核说明 **/
+    private BigDecimal adjustPrice;//审核价格
+    @JsonProperty("adjustComm")
+    private String adjustComm;//审核备注
+    @JsonProperty("lastModifyUserId")
+    private String lastModifyUserId;
+    @JsonProperty("lastModifyTime")
+    private LocalDateTime lastModifyTime;
+
 }