Merge remote-tracking branch 'origin/v11.0_add_tare_gross_weight_20240124' into release

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -44,6 +44,8 @@ public enum PerformanceResultEnum implements ResultEnum {
     ORDER_CHILD_CANCELED(1303, "运单状态已取消"),
     ORDER_CHILD_COMPLETE(1304, "运单状态已完成"),
     ORDER_CHILD_OPERATION_FORBID(1305, "没有权限操作"),
+    ORDER_CHILD_LOAD_NET_ERROR(1306, "净重不能大于99吨"),
+    ORDER_CHILD_TRACE_GT_ROUGH(1306, "皮重不能大于毛重"),
 
     ORDER_CHILD_SAVE_FAIL(1321, "接单失败,请稍后再试"),
     ORDER_CHILD_SAVE_FREQUENCY_ERROR(1322, "请误频繁点击"),

performance-api/src/main/java/com/clx/performance/param/app/OrderChildLoadAndUnloadAgainParam.java

@@ -26,13 +26,12 @@ public class OrderChildLoadAndUnloadAgainParam extends PositionParam {
     private String unloadPoundNo;
 
     @ApiModelProperty(value = "装货毛重（单位吨）", example = "2.46")
+    @NotNull
     private BigDecimal loadRough;
+
     @ApiModelProperty(value = "装货皮重（单位吨）", example = "1.23")
+    @NotNull
     private BigDecimal loadTare;
-    @ApiModelProperty(value = "装货净重（单位吨）", example = "1.23")
-    @NotNull(message = "装货净重不能为空")
-    @Max(value = 999, message = "最大999吨")
-    private BigDecimal loadNet;
 
     @ApiModelProperty(value = "磅单图片列表")
     @NotEmpty(message = "请上传磅单照片")

performance-api/src/main/java/com/clx/performance/param/app/OrderChildLoadParam.java

@@ -22,13 +22,12 @@ public class OrderChildLoadParam extends PositionParam {
     private String childNo;
 
     @ApiModelProperty(value = "装货毛重（单位吨）", example = "2.46")
+    @NotNull
     private BigDecimal loadRough;
+
     @ApiModelProperty(value = "装货皮重（单位吨）", example = "1.23")
+    @NotNull
     private BigDecimal loadTare;
-    @ApiModelProperty(value = "装货净重（单位吨）", example = "1.23")
-    @NotNull(message = "装货净重不能为空")
-    @Max(value = 999, message = "最大999吨")
-    private BigDecimal loadNet;
 
     @ApiModelProperty(value = "磅单图片列表")
     @NotEmpty(message = "请上传磅单照片")

performance-api/src/main/java/com/clx/performance/param/app/OrderChildUnloadParam.java

@@ -27,12 +27,9 @@ public class OrderChildUnloadParam extends PositionParam {
 
     @ApiModelProperty(value = "卸货毛重（单位吨）", example = "2.46")
     private BigDecimal unloadRough;
+
     @ApiModelProperty(value = "卸货皮重（单位吨）", example = "1.23")
     private BigDecimal unloadTare;
-    @ApiModelProperty(value = "卸货净重（单位吨）", example = "1.23")
-    @NotNull(message = "装货净重不能为空")
-    @Max(value = 999, message = "最大999吨")
-    private BigDecimal unloadNet;
 
     @ApiModelProperty(value = "磅单图片列表")
     @NotEmpty(message = "请上传磅单照片")

performance-api/src/main/java/com/clx/performance/param/pc/PoundAuditParam.java

@@ -34,11 +34,19 @@ public class PoundAuditParam  {
     @ApiModelProperty(value="审核状态 0 待审核 1 审核通过 2 审核驳回",example = "1")
     private Integer status;
 
-    @ApiModelProperty(value="装货净重",example = "11")
-    private BigDecimal loadNet;
+    @ApiModelProperty(value = "装货毛重", example = "10")
+    private BigDecimal loadRough;
+
+    @ApiModelProperty(value = "装货皮重", example = "10")
+    private BigDecimal loadTare;
+
+    @ApiModelProperty(value="卸货毛重",example = "41")
+    private BigDecimal unloadRough;
+
+    @ApiModelProperty(value="卸货皮重",example = "41")
+    private BigDecimal unloadTare;
+
 
-    @ApiModelProperty(value="卸货净重",example = "22")
-    private BigDecimal unloadNet;
 
 
 }

performance-api/src/main/java/com/clx/performance/vo/pc/CarrierOrderChildDetailVO.java

@@ -46,7 +46,6 @@ public class CarrierOrderChildDetailVO {
     @MoneyOutConvert
     private BigDecimal realFreight;
 
-
     @ApiModelProperty(value = "损耗单价（元）", example = "1.23")
     @MoneyOutConvert
     private BigDecimal lossPrice;
@@ -79,6 +78,18 @@ public class CarrierOrderChildDetailVO {
     @ApiModelProperty(value = "卸货净重（单位吨）", example = "1.23")
     private BigDecimal unloadNet;
 
+    @ApiModelProperty(value = "装货毛重", example = "10")
+    private BigDecimal loadRough;
+
+    @ApiModelProperty(value = "装货皮重", example = "10")
+    private BigDecimal loadTare;
+
+    @ApiModelProperty(value="卸货毛重",example = "41")
+    private BigDecimal unloadRough;
+
+    @ApiModelProperty(value="卸货皮重",example = "41")
+    private BigDecimal unloadTare;
+
     @ApiModelProperty(value = "取消原因", example = "取消原因类型：1个人原因, 2价格不合适, 3无法装货, 4车辆原因, 5交通管制, 6交通事故, 7无法找到地址, 8排队时间较长, 9其他原因")
     private Integer cancelType;
     @ApiModelProperty(value = "取消原因", example = "抢错了")

performance-api/src/main/java/com/clx/performance/vo/pc/OrderChildPoundAuditDetailVO.java

@@ -23,6 +23,18 @@ public class OrderChildPoundAuditDetailVO {
     @ApiModelProperty(value="卸货净重",example = "41")
     private BigDecimal unloadNet;
 
+    @ApiModelProperty(value = "装货毛重", example = "10")
+    private BigDecimal loadRough;
+
+    @ApiModelProperty(value = "装货皮重", example = "10")
+    private BigDecimal loadTare;
+
+    @ApiModelProperty(value="卸货毛重",example = "41")
+    private BigDecimal unloadRough;
+
+    @ApiModelProperty(value="卸货皮重",example = "41")
+    private BigDecimal unloadTare;
+
     @ApiModelProperty(value = "卸货磅单编号", example = "url")
     private String unloadPoundNo;
 

performance-api/src/main/java/com/clx/performance/vo/pc/PageCarrierOrderChildVO.java

@@ -43,6 +43,18 @@ public class PageCarrierOrderChildVO {
     @ApiModelProperty(value="卸货净重",example = "41")
     private BigDecimal unloadNet;
 
+    @ApiModelProperty(value = "装货毛重", example = "10")
+    private BigDecimal loadRough;
+
+    @ApiModelProperty(value = "装货皮重", example = "10")
+    private BigDecimal loadTare;
+
+    @ApiModelProperty(value="卸货毛重",example = "41")
+    private BigDecimal unloadRough;
+
+    @ApiModelProperty(value="卸货皮重",example = "41")
+    private BigDecimal unloadTare;
+
     @ApiModelProperty(value="接单时间",example = "2020-01-01 10:10:10")
     private String payTime;
 

performance-api/src/main/java/com/clx/performance/vo/pc/PageOrderChildPoundAuditVO.java

@@ -43,6 +43,18 @@ public class PageOrderChildPoundAuditVO {
     @ApiModelProperty(value="卸货净重",example = "41")
     private BigDecimal unloadNet;
 
+    @ApiModelProperty(value = "装货毛重", example = "10")
+    private BigDecimal loadRough;
+
+    @ApiModelProperty(value = "装货皮重", example = "10")
+    private BigDecimal loadTare;
+
+    @ApiModelProperty(value="卸货毛重",example = "41")
+    private BigDecimal unloadRough;
+
+    @ApiModelProperty(value="卸货皮重",example = "41")
+    private BigDecimal unloadTare;
+
     @ApiModelProperty(value="审核状态 0 待审核 1 审核通过 2 审核驳回",example = "1")
     private Integer status;
 

performance-web/src/main/java/com/clx/performance/controller/pc/OrderChildPoundAuditController.java

@@ -48,7 +48,7 @@ public class OrderChildPoundAuditController {
 
     @ApiOperation(value = "磅单审核接口",notes = "<br>By:李瑞新")
     @PostMapping("/updatePoundAudit")
-    public Result updatePoundAudit(@RequestBody @Validated PoundAuditParam param) {
+    public Result<Object> updatePoundAudit(@RequestBody @Validated PoundAuditParam param) {
         orderChildPoundAuditService.updatePoundAudit(param);
         return Result.ok();
     }

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/DictionaryController.java

+package com.clx.performance.controller.pc.carrier;
+
+import com.clx.performance.service.DictionaryService;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/dictionary")
+@Validated
+@Api(tags = "承运端-字典")
+@AllArgsConstructor
+public class DictionaryController {
+
+    private final DictionaryService dictionaryService;
+
+
+    @ApiOperation(value = "结算单列表（车主）",notes = "<br>By:刘海泉")
+    @GetMapping("/getOneByKey")
+    public Result<String> getOneByKey(String key) {
+        return Result.ok(dictionaryService.getOneByKey(key));
+    }
+
+}

performance-web/src/main/java/com/clx/performance/dao/DictionaryDao.java

+package com.clx.performance.dao;
+
+import com.msl.common.dao.BaseDao;
+import com.clx.performance.mapper.DictionaryMapper;
+import com.clx.performance.model.Dictionary;
+
+/**
+ * @author kavin
+ * Date 2024-01-24
+ * Time 13:34
+ */
+public interface DictionaryDao extends BaseDao<DictionaryMapper, Dictionary, Integer> {
+}

performance-web/src/main/java/com/clx/performance/dao/impl/DictionaryDaoImpl.java

+package com.clx.performance.dao.impl;
+
+import com.msl.common.dao.impl.BaseDaoImpl;
+import com.clx.performance.dao.DictionaryDao;
+import com.clx.performance.mapper.DictionaryMapper;
+import com.clx.performance.model.Dictionary;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author kavin
+ * Date 2024-01-24
+ * Time 13:34
+ */
+@Repository
+public class DictionaryDaoImpl extends BaseDaoImpl<DictionaryMapper, Dictionary, Integer> implements DictionaryDao {
+}

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -111,6 +111,10 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
                 .set(OrderChild::getPoundStatus, item.getPoundStatus())
                 .set(OrderChild::getLoadNet, item.getLoadNet())
                 .set(OrderChild::getUnloadNet, item.getUnloadNet())
+                .set(OrderChild::getLoadRough, item.getLoadRough())
+                .set(OrderChild::getLoadTare, item.getLoadTare())
+                .set(OrderChild::getUnloadRough, item.getUnloadRough())
+                .set(OrderChild::getUnloadTare, item.getUnloadTare())
                 .set(OrderChild::getWeight, item.getWeight())
                 .set(OrderChild::getFreight, item.getFreight())
         );

performance-web/src/main/java/com/clx/performance/mapper/DictionaryMapper.java

+package com.clx.performance.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.clx.performance.model.Dictionary;
+
+/**
+ * @author kavin
+ * Date 2024-01-24
+ * Time 13:34
+ */
+public interface DictionaryMapper extends BaseMapper<Dictionary> {
+}

performance-web/src/main/java/com/clx/performance/model/Dictionary.java

+package com.clx.performance.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.msl.common.config.KeyColumn;
+import com.msl.common.model.HasKey;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+/**
+ * @author kavin
+ * Date 2024-01-24
+ * Time 13:34
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("dictionary")
+public class Dictionary implements HasKey<Integer> {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("dictionary_name")
+    @ApiModelProperty("")
+    private String dictionaryName;
+
+    @TableField("dictionary_value")
+    @ApiModelProperty("")
+    private String dictionaryValue;
+
+    @Override
+    @KeyColumn("id")
+    public Integer gainKey() {
+    return this.id;
+    }
+}

performance-web/src/main/java/com/clx/performance/model/OrderChildPoundAudit.java

@@ -33,6 +33,10 @@ public class OrderChildPoundAudit implements HasKey<Integer> {
     private String childNo;                         //运单编号
     private BigDecimal loadNet;                     //装货净重（单位吨）
     private BigDecimal unloadNet;                   //卸货净重（单位吨）
+    private BigDecimal loadRough;                   //装货毛重（单位吨）
+    private BigDecimal loadTare;                    //装货皮重（单位吨）
+    private BigDecimal unloadRough;                 //卸货毛重（单位吨）
+    private BigDecimal unloadTare;                  //卸货皮重（单位吨）
     private String unloadPoundNo;                   //卸货磅单编号
     private Integer status;                         //审核状态  0 待审核 1 审核通过 2 审核驳回
     private Integer rejectType;                     //审核驳回类型：1装车 2卸车 3装车+卸车

performance-web/src/main/java/com/clx/performance/service/DictionaryService.java

+package com.clx.performance.service;
+
+
+
+/**
+ * @author kavin
+ * Date 2024-01-24
+ * Time 13:34
+ */
+public interface DictionaryService {
+
+    String getOneByKey(String key);
+}

performance-web/src/main/java/com/clx/performance/service/impl/DictionaryServiceImpl.java

+package com.clx.performance.service.impl;
+
+import com.clx.performance.dao.DictionaryDao;
+import com.clx.performance.model.Dictionary;
+import com.clx.performance.service.DictionaryService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author kavin
+ * Date 2024-01-24
+ * Time 13:34
+ */
+@Service
+@AllArgsConstructor
+public class DictionaryServiceImpl implements DictionaryService {
+
+    private final DictionaryDao dictionaryDao;
+
+    @Override
+    public String getOneByKey(String key) {
+        Dictionary dictionary = dictionaryDao.getOneByField(Dictionary::getDictionaryName, key).get();
+        return dictionary.getDictionaryValue();
+    }
+}

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildPoundAuditServiceImpl.java

@@ -62,6 +62,10 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
         vo.setLoadNet(poundAuditDetail.getLoadNet());
         vo.setUnloadNet(poundAuditDetail.getUnloadNet());
         vo.setUnloadPoundNo(poundAuditDetail.getUnloadPoundNo());
+        vo.setUnloadTare(poundAuditDetail.getUnloadTare());
+        vo.setUnloadRough(poundAuditDetail.getUnloadRough());
+        vo.setLoadRough(poundAuditDetail.getLoadRough());
+        vo.setLoadTare(poundAuditDetail.getLoadTare());
         vo.setStatus(poundAuditDetail.getStatus());
         vo.setRemark(poundAuditDetail.getRemark());
         vo.setRejectType(poundAuditDetail.getRejectType());
@@ -74,7 +78,15 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
     public void updatePoundAudit(PoundAuditParam param) {
         //运单详情
         OrderChild orderChild = orderChildDao.getByChildNo(param.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        BigDecimal loadNet = param.getLoadRough().subtract(param.getLoadTare());
+        if (loadNet.compareTo(new BigDecimal(99)) > 0) {
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_LOAD_NET_ERROR);
+        }
+        if (param.getLoadTare().compareTo(param.getLoadRough()) > 0) {
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_TRACE_GT_ROUGH);
+        }
 
+        BigDecimal unLoadNet = param.getUnloadRough().subtract(param.getUnloadTare());
         if(OrderChildEnum.CANCEL_lIST.contains(orderChild.getStatus())){
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_CANCELED);
         }
@@ -94,21 +106,24 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
         poundAuditDetail.setCreateTime(null);
         poundAuditDetail.setModifiedTime(null);
 
-        BigDecimal dif = param.getLoadNet().subtract(orderChild.getLoadNet());
+        BigDecimal dif = loadNet.subtract(orderChild.getLoadNet());
 
         int type = OrderChildLogEnum.Type.POUND_AUDIT.getCode();
         if(Objects.equals(param.getStatus(), OrderChildPoundAuditEnum.Status.REJECT.getCode())){
             type = OrderChildLogEnum.Type.POUND_AUDIT_REJECT.getCode();
         }else{
-            if(Objects.nonNull(param.getLoadNet())){
-                poundAuditDetail.setLoadNet(param.getLoadNet());
-                orderChild.setLoadNet(param.getLoadNet());
-            }
-
-            if(Objects.nonNull(param.getUnloadNet())){
-                poundAuditDetail.setUnloadNet(param.getUnloadNet());
-                orderChild.setUnloadNet(param.getUnloadNet());
-            }
+            poundAuditDetail.setLoadNet(loadNet);
+            poundAuditDetail.setUnloadNet(unLoadNet);
+            poundAuditDetail.setLoadRough(param.getLoadRough());
+            poundAuditDetail.setLoadTare(param.getLoadTare());
+            poundAuditDetail.setUnloadRough(param.getUnloadRough());
+            poundAuditDetail.setUnloadTare(param.getUnloadTare());
+            orderChild.setLoadNet(loadNet);
+            orderChild.setUnloadNet(unLoadNet);
+            orderChild.setLoadRough(param.getLoadRough());
+            orderChild.setLoadTare(param.getLoadTare());
+            orderChild.setUnloadRough(param.getUnloadRough());
+            orderChild.setUnloadTare(param.getUnloadTare());
         }
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setFreight(orderChildFreightCalc(orderChild));

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderChildSqlProvider.java

@@ -83,7 +83,8 @@ public class OrderChildSqlProvider {
 
     public String pagePoundAuditList(@Param("page") Page<PageOrderChildPoundAuditVO> page, @Param("param") PagePoundAuditParam param) {
         return new SQL(){{
-            SELECT("child_no,pound_status as status,goods_name,send_address,receive_address,driver_name,driver_mobile,load_net,unload_net," +
+            SELECT("child_no,pound_status as status,goods_name,send_address,receive_address,driver_name," +
+                    "driver_mobile,load_net,unload_net,load_rough,load_tare,unload_rough,unload_tare," +
                     "date_format(pay_time, '%Y-%m-%d %H:%i:%s') as payTime," +
                     "date_format(load_time, '%Y-%m-%d %H:%i:%s') as loadTime," +
                     "date_format(unload_time, '%Y-%m-%d %H:%i:%s') as unloadTime ");
@@ -107,7 +108,9 @@ public class OrderChildSqlProvider {
 
     public String pageCarrierOrderChildList(@Param("page") Page<PageCarrierOrderChildVO> page, @Param("param") PageCarrierOrderChildParam param) {
         return new SQL(){{
-            SELECT("child_no,order_goods_no,status,goods_name,freight_price,send_address,receive_address,driver_name,driver_mobile,load_net,unload_net," +
+            SELECT("child_no,order_goods_no,status,goods_name," +
+                    "freight_price,send_address,receive_address,load_rough,load_tare,unload_rough,unload_tare," +
+                    "driver_name,driver_mobile,load_net,unload_net," +
                     "date_format(pay_time, '%Y-%m-%d %H:%i:%s') as payTime," +
                     "date_format(finish_time, '%Y-%m-%d %H:%i:%s') as finishTime");
             FROM("order_child ");