承运订单-分包托运增加页面数据展示字段

采购订单/销售订单-增加单据号生成
采购订单/销售订单-物流托运增加字段翻译展示

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/RedisOrderGenerateEnum.java

@@ -14,6 +14,11 @@ public enum RedisOrderGenerateEnum {
      */
     LOGISTICS_ORDER("logisticsOrder","logistics_order_no_generator:","物流订单key"),
 
+    /**
+     * 物流订单-分包key
+     */
+    LOGISTICS_SUBCONTRACT_ORDER("logisticsOrder","logistics_subcontract_order_no_generator:","物流订单-分包key"),
+
     TRADE_ORDER("tradeOrder","trade_order_no_generator:","贸易订单key"),
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/LogisticsConsignmentController.java

@@ -186,6 +186,7 @@ public class LogisticsConsignmentController {
         try {
             return logisticsConsignmentService.sellLogisticsConsignment(logisticsConsignmentParam);
         } catch (Exception e) {
+            OrderGenerateSeqNoUtils.getSeqNoMinusOne(RedisOrderGenerateEnum.LOGISTICS_ORDER,OrderRuleEnum.LOGISTICS_ORDER);
             log.error("物流托运 error :{}", e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
         }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtLogisticsOrder.java

@@ -1,6 +1,5 @@
 package com.sckw.transport.model;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import jakarta.validation.constraints.DecimalMin;
@@ -13,7 +12,6 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.Date;
-import java.util.List;
 
 /**
  * @author lfdc
@@ -24,8 +22,6 @@ import java.util.List;
 @TableName("kwt_logistics_order")
 public class KwtLogisticsOrder implements Serializable {
 
-    @TableField(exist = false)
-    private List<KwtLogisticsOrder> childList;
     /**
      * 主键
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/SubcontractConsignmentDTO.java

@@ -74,7 +74,8 @@ public class SubcontractConsignmentDTO /**implements IdsList*/ {
      * 商品价值（扣亏货值）
      */
 //    @NotNull(message = "扣亏货值不能为空")
-    private Long goodsPrice;
+    @Digits(integer = 5, fraction = 2,message = "商品价值（扣亏货值）格式填写错误")
+    private BigDecimal goodsPrice;
     /**
      * 商品价值（扣亏货值）单位
      */
@@ -169,7 +170,8 @@ public class SubcontractConsignmentDTO /**implements IdsList*/ {
      * 运价
      */
     @NotNull(message = "运价不能为空")
-    private Long price;
+    @Digits(integer = 5,fraction = 2,message = "运价格式填写错误!")
+    private BigDecimal price;
 
     /**
      * 运价方式
@@ -212,6 +214,7 @@ public class SubcontractConsignmentDTO /**implements IdsList*/ {
     /**
      * 扣亏货值
      */
-    private Long defectiveValue;
+    @Digits(integer = 5,fraction = 2,message = "扣亏货值格式填写错误")
+    private BigDecimal defectiveValue;
 
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/LogisticsConsignmentParam.java

@@ -68,7 +68,7 @@ public class LogisticsConsignmentParam {
 //    @NotNull(message = "合理损耗不能为空")
 //    @DecimalMin(value = "0.00",message = "必须为大于0的正整数")
     @Digits(integer = 5, fraction = 2, message = "合理损耗超长")
-    private Long loss;
+    private BigDecimal loss;
     /**
      * 合理损耗单位
      */
@@ -79,7 +79,7 @@ public class LogisticsConsignmentParam {
      */
 //    @NotNull(message = "扣亏货值不能为空")
 //    @DecimalMin(value = "0.00",message = "必须为大于0的正整数")
-    private Long goodsPrice;
+    private BigDecimal goodsPrice;
     /**
      * 商品价值（扣亏货值）单位
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/SubcontractConsignmentVO.java

@@ -53,10 +53,27 @@ public class SubcontractConsignmentVO {
      * 装货地点
      */
     private String loadAddress;
+    /**
+     * 详细装货地点
+     */
+    private String loadAddressDetail;
+    /**
+     * 装货城市
+     */
+    private String loadCityName;
     /**
      * 卸货地点
      */
     private String unloadAddress;
+
+    /**
+     * 详细卸货地点
+     */
+    private String unloadAddressDetail;
+    /**
+     * 卸货城市
+     */
+    private String unloadCityName;
     /**
      * 运价
      */
@@ -67,18 +84,36 @@ public class SubcontractConsignmentVO {
      */
     private String priceType;
 
+    /**
+     * 运价方式
+     */
+    private String priceTypeLabel;
+
     /**
      * 计费方式
      */
     private String billingMode;
+
+    /**
+     * 计费方式
+     */
+    private String billingModeLabel;
+
     /**
      * 合理损耗
      */
     private String loss;
+
     /**
      * 合理损耗
      */
     private String lossUnit;
+
+    /**
+     * 合理损耗
+     */
+    private String lossUnitLabel;
+
     /**
      * 扣亏货值/元/吨
      */
@@ -88,34 +123,52 @@ public class SubcontractConsignmentVO {
      * 扣亏货值/元/吨
      */
     private String goodsPriceUnit;
+
+    /**
+     * 扣亏货值/元/吨
+     */
+    private String goodsPriceUnitLabel;
+
     /**
      * 结算周期
      */
     private String settlementCycle;
+
+    /**
+     * 结算周期
+     */
+    private String settlementCycleLabel;
+
     /**
      * 承运联系人
      */
     private String carrierContacts;
+
     /**
      * 承运联系电话
      */
     private String carrierPhone;
+
     /**
      * 托运单位
      */
     private String consignCompany;
+
     /**
      * 托运联系人
      */
     private String consignContacts;
+
     /**
      * 托运联系电话
      */
     private String consignPhone;
+
     /**
      * 装货联系人
      */
     private String loadContacts;
+
     /**
      * 装货电话
      */
@@ -131,12 +184,12 @@ public class SubcontractConsignmentVO {
     /**
      * 计划发货时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date shipmentsDate;
     /**
      * 计划收货时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date receiveGoodsDate;
     /**
      * 承运订单号
@@ -154,10 +207,12 @@ public class SubcontractConsignmentVO {
      * 合同名称
      */
     private String contractName;
+
     /**
      * 签约方式
      */
-    private String contractSigningWay;
+    private String signingWay;
+
     /**
      * 备注
      */
@@ -166,6 +221,11 @@ public class SubcontractConsignmentVO {
      * 创建人
      */
     private String createBy;
+
+    /**
+     * 创建人
+     */
+    private String createName;
     /**
      * 创建时间
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/AcceptCarriageOrderService.java

@@ -187,7 +187,9 @@ public class AcceptCarriageOrderService {
                         .eq(KwtLogisticsOrder::getDelFlag, NumberConstant.ZERO)
                         .apply(logisticsOrder.getId() != null, "FIND_IN_SET ('" + bo.getLOrderId() + "', pids)").ne(KwtLogisticsOrder::getId, bo.getLOrderId()))
                 .stream().count();
-        String lOrderNo = OrderGenerateSeqNoUtils.getSeqNo(RedisOrderGenerateEnum.LOGISTICS_ORDER, OrderRuleEnum.LOGISTICS_ORDER, logisticsOrder.getType(), String.valueOf(level), String.valueOf(number));
+        String pidOrderNo = logisticsOrder.getLOrderNo();
+        String substring = pidOrderNo.substring(0, 11);
+        String lOrderNo = substring + logisticsOrder.getType() + String.valueOf(level) + String.valueOf(number + 1);
         Long orderId = new IdWorker(NumberConstant.ONE).nextId();
         /**分包托运需要判断处于哪一级分包托运
          * 需要记录当前分包数据-分包上游数据
@@ -235,7 +237,7 @@ public class AcceptCarriageOrderService {
         }
         insertSubcontractLogisticsGoods(bo, lOrderNo, orderId);
         insertSubcontractLogisticsOrder(bo, lOrderNo, order, orderId, pids, orderStatus, logisticsOrder);
-        insertSubcontractLogisticsOrderContract(bo, orderId);
+        insertSubcontractLogisticsOrderContract(bo, orderId, infoResDto);
         insertSubcontractLogisticsOrderUnit(bo, orderId);
         insertSubcontractLogisticsOrderAddress(bo, orderId, logisticsOrder);
         insertLogisticsOrderTrack(bo, orderId, orderStatus);
@@ -284,7 +286,7 @@ public class AcceptCarriageOrderService {
         logisticsOrder.setLOrderNo(lOrderNo);
         logisticsOrder.setLOrderPid(Long.parseLong(bo.getLOrderId()));
         logisticsOrder.setSettlementCycle(bo.getSettlementCycle());
-        logisticsOrder.setPrice(new BigDecimal(bo.getPrice()));
+        logisticsOrder.setPrice(bo.getPrice());
         logisticsOrder.setPriceType(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()) == null ?
                 null : Long.parseLong(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()).getValue()));
         if (!bo.getIsFullDose()) {
@@ -301,7 +303,7 @@ public class AcceptCarriageOrderService {
         }
         logisticsOrder.setLoss(bo.getLoss() == null ? null : bo.getLoss());
         logisticsOrder.setLossUnit(bo.getLossUnit());
-        logisticsOrder.setGoodsPrice(bo.getGoodsPrice() == null ? null : new BigDecimal(bo.getGoodsPrice()));
+        logisticsOrder.setGoodsPrice(bo.getGoodsPrice());
         BigDecimal decimal = new BigDecimal(NumberConstant.ZERO);
         logisticsOrder.setSubcontractAmount(decimal);
         logisticsOrder.setEntrustAmount(decimal);
@@ -509,11 +511,14 @@ public class AcceptCarriageOrderService {
      * @param bo
      * @param orderId
      */
-    private void insertSubcontractLogisticsOrderContract(SubcontractConsignmentDTO bo, Long orderId) {
+    private void insertSubcontractLogisticsOrderContract(SubcontractConsignmentDTO bo, Long orderId, ContractCommonInfoResDto infoResDto) {
         KwtLogisticsOrderContract kwtLogisticsOrderContract = new KwtLogisticsOrderContract();
         kwtLogisticsOrderContract.setId(new IdWorker(NumberConstant.ONE).nextId());
         kwtLogisticsOrderContract.setLOrderId(orderId);
         kwtLogisticsOrderContract.setContractId(Long.parseLong(bo.getContractId()));
+        kwtLogisticsOrderContract.setContractName(bo.getContractName() == null ? infoResDto.getContactName() : bo.getContractName());
+        kwtLogisticsOrderContract.setContractNo(bo.getContractNo() == null ? infoResDto.getContractCode() : bo.getContractNo());
+        kwtLogisticsOrderContract.setSigningWay(infoResDto.getSigningWay() != null ? String.valueOf(infoResDto.getSigningWay()) : null);
         kwtLogisticsOrderContract.setRemark(bo.getRemark());
         kwtLogisticsOrderContract.setCreateBy(LoginUserHolder.getUserId());
         kwtLogisticsOrderContract.setUpdateBy(LoginUserHolder.getUserId());
@@ -547,7 +552,7 @@ public class AcceptCarriageOrderService {
         //存放所有的分包的父级id
         order.setPids(pids);
         order.setSettlementCycle(bo.getSettlementCycle());
-        order.setPrice(new BigDecimal(bo.getPrice()));
+        order.setPrice(bo.getPrice());
         order.setPriceType(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()) == null ?
                 null : Long.parseLong(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()).getValue()));
         order.setAmount(bo.getCarryingCapacity());
@@ -556,7 +561,7 @@ public class AcceptCarriageOrderService {
 //        order.setLossUnit(bo.getLossUnit());
         order.setLossUnit(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.UNIT_TYPE.getType(), bo.getLossUnit()) == null ?
                 null : remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.UNIT_TYPE.getType(), bo.getLossUnit()).getValue());
-        order.setGoodsPrice(bo.getGoodsPrice() == null ? null : new BigDecimal(bo.getGoodsPrice()));
+        order.setGoodsPrice(bo.getGoodsPrice() == null ? null : bo.getGoodsPrice());
         order.setGoodsPriceUnit(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getGoodsPriceUnit()) == null ?
                 null : remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getGoodsPriceUnit()).getValue());
 //        order.setGoodsPriceUnit(bo.getGoodsPriceUnit());
@@ -620,6 +625,7 @@ public class AcceptCarriageOrderService {
         HttpResult httpResult = ValidUtil.serviceValid(orderDTO);
         if (!String.valueOf(httpResult.getCode()).equals(String.valueOf(HttpStatus.SUCCESS_CODE))) {
             result.setMsg(httpResult.getMsg());
+            result.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
             return result;
         }
         KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
@@ -634,11 +640,13 @@ public class AcceptCarriageOrderService {
         }
         if (!LogisticsOrderEnum.PENDING_ORDER.getStatus().equals(String.valueOf(logisticsOrder.getStatus()))) {
             result.setMsg("该【" + orderDTO.getLOrderNo() + "】单号并不是待接单状态!");
+            result.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
             return result;
         }
         KwtLogisticsOrderContract contract = kwtLogisticsOrderContractMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderContract>()
                 .eq(KwtLogisticsOrderContract::getLOrderId, orderDTO.getLOrderId()));
         if (contract == null) {
+            result.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
             result.setMsg("该订单并未存在合同信息!");
             return result;
         }
@@ -689,8 +697,7 @@ public class AcceptCarriageOrderService {
                     .set(KwtLogisticsOrder::getUpdateBy, LoginUserHolder.getUserId()));
         } else {
             orderStatus = LogisticsOrderEnum.REJECT_ORDER.getCode();
-            //todo 当前为删除订单 后续要改为拒绝接单  数据统计在页面已退回状态中
-            //删除订单
+            //todo 改为拒绝接单  数据统计在页面已退回状态中
             logisticsOrderMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrder>()
                     .eq(StringUtils.isNotBlank(orderDTO.getLOrderId()), KwtLogisticsOrder::getId, orderDTO.getLOrderId())
                     .eq(StringUtils.isNotBlank(orderDTO.getLOrderNo()), KwtLogisticsOrder::getLOrderNo, orderDTO.getLOrderNo())
@@ -698,18 +705,45 @@ public class AcceptCarriageOrderService {
                     .set(KwtLogisticsOrder::getUpdateTime, new Date())
                     .set(KwtLogisticsOrder::getUpdateBy, LoginUserHolder.getUserId()));
 
-            /**数据回退至贸易订单*/
-            if (logisticsOrder.getTOrderId() != null) {
-                /**将生成的分配量->贸易订单*/
-                CreateOrCancelLogisticsOrderParam param = new CreateOrCancelLogisticsOrderParam();
-                param.setTOrderId(Long.valueOf(logisticsOrder.getTOrderId()));
-                param.setEntrustAmount(logisticsOrder.getAmount().negate());
-                param.setUpdateBy(LoginUserHolder.getUserId());
-                param.setUpdateByName(LoginUserHolder.getUserName());
-                HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrder(param);
-                if (result1.getCode() != HttpStatus.SUCCESS_CODE) {
-                    log.info("{}拒绝接单->贸易订单失败!,返回信息:{}", "id:" + logisticsOrder.getTOrderId() + "orderNo" + logisticsOrder.getTOrderNo(), JSONObject.toJSONString(result1));
-                    throw new BusinessException("{" + logisticsOrder.getTOrderNo() + "} 拒绝接单->贸易订单失败!");
+            /**数据回退至贸易订单/上级物流订单*/
+            if (logisticsOrder.getPid() != null) {
+                KwtLogisticsOrder kwtLogisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
+                        .eq(KwtLogisticsOrder::getId, logisticsOrder.getPid())
+                );
+                if (kwtLogisticsOrder != null) {
+                    kwtLogisticsOrder.setEntrustAmount(kwtLogisticsOrder.getEntrustAmount().subtract(logisticsOrder.getAmount()));
+                    kwtLogisticsOrder.setSubcontractAmount(kwtLogisticsOrder.getSubcontractAmount().subtract(logisticsOrder.getAmount()));
+                    kwtLogisticsOrder.setUpdateBy(LoginUserHolder.getUserId());
+                    kwtLogisticsOrder.setUpdateTime(new Date());
+                    logisticsOrderMapper.updateById(kwtLogisticsOrder);
+                    /**数据回归mongodb*/
+                    SckwLogisticsOrder order = new SckwLogisticsOrder();
+                    order.set_id(kwtLogisticsOrder.getId());
+                    order.setLOrderId(kwtLogisticsOrder.getId());
+                    order.setEntrustAmount(kwtLogisticsOrder.getEntrustAmount());
+                    order.setSubcontractAmount(kwtLogisticsOrder.getSubcontractAmount());
+                    order.setUpdateBy(LoginUserHolder.getUserId());
+                    order.setUpdateTime(new Date());
+                    order.setUpdateByName(LoginUserHolder.getUserName());
+                    SckwBusSum busSum = new SckwBusSum();
+                    busSum.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
+                    busSum.setMethod(NumberConstant.TWO);
+                    busSum.setObject(order);
+                    streamBridge.send("sckw-busSum", com.alibaba.fastjson2.JSON.toJSONString(busSum));
+                }
+            } else {
+                if (logisticsOrder.getTOrderId() != null) {
+                    /**将生成的分配量->贸易订单*/
+                    CreateOrCancelLogisticsOrderParam param = new CreateOrCancelLogisticsOrderParam();
+                    param.setTOrderId(Long.valueOf(logisticsOrder.getTOrderId()));
+                    param.setEntrustAmount(logisticsOrder.getAmount().negate());
+                    param.setUpdateBy(LoginUserHolder.getUserId());
+                    param.setUpdateByName(LoginUserHolder.getUserName());
+                    HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrder(param);
+                    if (result1.getCode() != HttpStatus.SUCCESS_CODE) {
+                        log.info("{}拒绝接单->贸易订单失败!,返回信息:{}", "id:" + logisticsOrder.getTOrderId() + "orderNo" + logisticsOrder.getTOrderNo(), JSONObject.toJSONString(result1));
+                        throw new BusinessException("{" + logisticsOrder.getTOrderNo() + "} 拒绝接单->贸易订单失败!");
+                    }
                 }
             }
 
@@ -807,14 +841,32 @@ public class AcceptCarriageOrderService {
             //联查数据
             if (CollectionUtils.isNotEmpty(list)) {
                 for (SubcontractConsignmentVO subcontractConsignmentVO : list) {
-                    subcontractConsignmentVO.setStatusLabel(CarWaybillEnum.getWaybillOrderDestination(subcontractConsignmentVO.getStatus()));
-                    subcontractConsignmentVO.setPriceType(priceDictData == null ? null : priceDictData.get(subcontractConsignmentVO.getPriceType()));
-                    subcontractConsignmentVO.setLossUnit(weightDictData == null ? null : weightDictData.get(subcontractConsignmentVO.getLossUnit()));
-                    subcontractConsignmentVO.setGoodsPriceUnit(priceDictData == null ? null : priceDictData.get(subcontractConsignmentVO.getGoodsPriceUnit()));
+                    subcontractConsignmentVO.setStatusLabel(LogisticsOrderEnum.getDestination(subcontractConsignmentVO.getStatus()));
+                    if (subcontractConsignmentVO.getPriceType() != null) {
+                        subcontractConsignmentVO.setPriceTypeLabel(priceDictData == null ? null : priceDictData.get(subcontractConsignmentVO.getPriceType()));
+                    }
+                    if (subcontractConsignmentVO.getLossUnit() != null) {
+                        subcontractConsignmentVO.setLossUnitLabel(weightDictData == null ? null : weightDictData.get(subcontractConsignmentVO.getLossUnit()));
+                    }
+                    if (subcontractConsignmentVO.getGoodsPriceUnit() != null) {
+                        subcontractConsignmentVO.setGoodsPriceUnitLabel(priceDictData == null ? null : priceDictData.get(subcontractConsignmentVO.getGoodsPriceUnit()));
+                    }
                     //分包托运不需要展示签约方式
 //                subcontractConsignmentVO.setContractSigningWay(singDictData == null ? null : singDictData.get(subcontractConsignmentVO.getContractSigningWay()));
-                    subcontractConsignmentVO.setBillingMode(chargingDictData == null ? null : chargingDictData.get(subcontractConsignmentVO.getBillingMode()));
-                    subcontractConsignmentVO.setSettlementCycle(settlementDictData == null ? null : settlementDictData.get(subcontractConsignmentVO.getSettlementCycle()));
+                    if (subcontractConsignmentVO.getBillingMode() != null) {
+                        subcontractConsignmentVO.setBillingModeLabel(chargingDictData == null ? null : chargingDictData.get(subcontractConsignmentVO.getBillingMode()));
+                    }
+                    if (subcontractConsignmentVO.getSettlementCycle() != null) {
+                        subcontractConsignmentVO.setSettlementCycleLabel(settlementDictData == null ? null : settlementDictData.get(subcontractConsignmentVO.getSettlementCycle()));
+                    }
+                    if (subcontractConsignmentVO.getCreateBy() != null) {
+                        UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(Long.parseLong(subcontractConsignmentVO.getCreateBy()));
+                        if (userCacheResDto != null) {
+                            subcontractConsignmentVO.setCreateName(userCacheResDto.getName());
+                        }
+                    }
+                    subcontractConsignmentVO.setLoadAddressDetail(subcontractConsignmentVO.getLoadCityName() + subcontractConsignmentVO.getLoadAddress());
+                    subcontractConsignmentVO.setUnloadAddressDetail(subcontractConsignmentVO.getUnloadCityName() + subcontractConsignmentVO.getUnloadAddress());
                 }
                 allList.addAll(list);
             }
@@ -1592,7 +1644,7 @@ public class AcceptCarriageOrderService {
         /**保存新建数据*/
         Long lOrderId = new IdWorker(NumberConstant.ONE).nextId();
         /**生成订单编号*/
-        String lOrderNo = OrderGenerateSeqNoUtils.getSeqNo(RedisOrderGenerateEnum.LOGISTICS_ORDER, OrderRuleEnum.LOGISTICS_ORDER, "2", "0", "1");
+        String lOrderNo = OrderGenerateSeqNoUtils.getSeqNo(RedisOrderGenerateEnum.LOGISTICS_ORDER, OrderRuleEnum.LOGISTICS_ORDER, "2", "0", "0");
         /**根据合同计算当前单据状态*/
         /**判断生成物流订单应生成哪一种单据状态*/
         List<Long> contractList = new ArrayList<>();

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/ConsignOrderService.java

@@ -1105,7 +1105,7 @@ public class ConsignOrderService {
         /**保存新建数据*/
         Long lOrderId = new IdWorker(NumberConstant.ONE).nextId();
         /**生成订单编号*/
-        String lOrderNo = OrderGenerateSeqNoUtils.getSeqNo(RedisOrderGenerateEnum.LOGISTICS_ORDER, OrderRuleEnum.LOGISTICS_ORDER, "2", "0", "1");
+        String lOrderNo = OrderGenerateSeqNoUtils.getSeqNo(RedisOrderGenerateEnum.LOGISTICS_ORDER, OrderRuleEnum.LOGISTICS_ORDER, "2", "0", "0");
         /**根据合同计算当前单据状态*/
         /**判断生成物流订单应生成哪一种单据状态*/
         List<Long> contractList = new ArrayList<>();

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/LogisticsConsignmentService.java

@@ -123,12 +123,12 @@ public class LogisticsConsignmentService {
 
     private void checkParamData(LogisticsConsignmentParam bo) {
         if (!ObjectUtils.isEmpty(bo.getLoss())) {
-            if (NumberConstant.ZERO > bo.getLoss()) {
+            if (bo.getLoss().compareTo(new BigDecimal("0.00")) < 0) {
                 throw new RuntimeException("合理损耗填写时,必须大于0");
             }
         }
         if (!ObjectUtils.isEmpty(bo.getGoodsPrice())) {
-            if (NumberConstant.ZERO > bo.getGoodsPrice()) {
+            if (bo.getGoodsPrice().compareTo(new BigDecimal("0.00")) < 0) {
                 throw new RuntimeException("扣亏货值填写时,必须大于0");
             }
         }
@@ -236,9 +236,9 @@ public class LogisticsConsignmentService {
             logisticsOrder.setSubcontractAmount(new BigDecimal("0.00"));
             logisticsOrder.setCarryingCapacity(new BigDecimal("0.00"));
         }
-        logisticsOrder.setLoss(bo.getLoss() == null ? null : new BigDecimal(bo.getLoss()));
+        logisticsOrder.setLoss(bo.getLoss() == null ? null :bo.getLoss());
         logisticsOrder.setLossUnit(bo.getLossUnit());
-        logisticsOrder.setGoodsPrice(bo.getGoodsPrice() == null ? null : new BigDecimal(bo.getGoodsPrice()));
+        logisticsOrder.setGoodsPrice(bo.getGoodsPrice() == null ? null : bo.getGoodsPrice());
         BigDecimal decimal = new BigDecimal(NumberConstant.ZERO);
         logisticsOrder.setSubcontractAmount(decimal);
         logisticsOrder.setEntrustAmount(decimal);
@@ -443,11 +443,11 @@ public class LogisticsConsignmentService {
 //        order.setAmount(tradeOrder.getAmount());
         order.setBillingMode(bo.getBillingMode());
         order.setUnit(bo.getCarryingCapacityUnit());
-        order.setLoss(bo.getLoss() == null ? null : new BigDecimal(bo.getLoss()));
+        order.setLoss(bo.getLoss() == null ? null : bo.getLoss());
 //        order.setLossUnit(bo.getLossUnit());
         order.setLossUnit(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.UNIT_TYPE.getType(), bo.getLossUnit()) == null ?
                 null : remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.UNIT_TYPE.getType(), bo.getLossUnit()).getValue());
-        order.setGoodsPrice(bo.getGoodsPrice() == null ? null : new BigDecimal(bo.getGoodsPrice()));
+        order.setGoodsPrice(bo.getGoodsPrice() == null ? null : bo.getGoodsPrice());
         order.setGoodsPriceUnit(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getGoodsPriceUnit()) == null ?
                 null : remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getGoodsPriceUnit()).getValue());
         order.setGoodsPriceUnit(bo.getGoodsPriceUnit());
@@ -1867,7 +1867,7 @@ public class LogisticsConsignmentService {
         String seqNo1 = OrderGenerateSeqNoUtils.getOtherSeqNo(RedisOrderGenerateEnum.LOGISTICS_ORDER, OrderRuleEnum.LOGISTICS_ORDER);
         System.out.println(seqNo);
         System.out.println(seqNo1);
-        return HttpResult.ok(seqNo+":"+seqNo1);
+        return HttpResult.ok(seqNo + ":" + seqNo1);
     }
 
     public static void getLogisticsLOrderNo(String t, String number, String number1, String number2) {

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderMapper.xml

@@ -274,9 +274,10 @@
                a.pid,
                a.`status`         as status,
                a.l_order_no       as consignOrderNo,
-               c.firm_name        as carrierContacts,
+               a.l_order_no       as carrierOrderNo,
+               c.firm_name        as carrierCompany,
                d.goods_name       as goodsName,
-               a.amount           as amount,
+               a.amount           as carryingCapacity,
                a.price,
                a.price_type       as priceType,
                e.detail_address   as loadAddress,
@@ -293,7 +294,7 @@
                b.contacts         as consignContacts,
                b.phone            as consignPhone,
                e.contacts         as loadContacts,
-               e.phone            as loadContacts,
+               e.phone            as loadPhone,
                f.contacts         as unloadContacts,
                f.phone            as unloadPhone,
                a.start_time       as shipmentsDate,
@@ -301,7 +302,12 @@
                a.remark,
                a.create_by        as createBy,
                a.create_time      as createTime,
-               g.contract_id      as contractId
+               g.contract_id      as contractId,
+               g.contract_no      as contractNo,
+               g.contract_name    as contractName,
+               g.signing_way      as signing,
+               e.city_name        as loadCityName,
+               f.city_name        as unloadCityName
         FROM kwt_logistics_order a
                  LEFT JOIN kwt_logistics_order_unit b ON a.id = b.l_order_id
             AND b.unit_type = 1