优化

snowy-admin-web/src/views/biz/bizexcessconfig/form.vue

@@ -11,7 +11,7 @@
 				<a-input-number v-model:value="formData.vehicleAxleNumber" style="width:90%"  :precision="0" :min="1" :max="99999" placeholder="请输入车辆轴数" allow-clear /><span style="margin-left:10px;">个</span>
 			</a-form-item>
 			<a-form-item label="超限重量：" name="excessWeight">
-				<a-input-number v-model:value="formData.excessWeight" style="width:90%"  :precision="0" :min="1" :max="999999" placeholder="请输入超限重量" allow-clear /><span style="margin-left:10px;">KG</span>
+				<a-input-number v-model:value="formData.excessWeight" style="width:90%"  :precision="2" :min="1" :max="999999" placeholder="请输入超限重量" allow-clear /><span style="margin-left:10px;">吨</span>
 			</a-form-item>
 			<a-form-item label="是否启用：" name="status" v-if="formData.id!=null && formData.id!=''">
 				<a-radio-group button-style="solid" v-model:value="formData.status">

snowy-admin-web/src/views/biz/bizexcessconfig/index.vue

@@ -61,7 +61,7 @@
 			align:'center'
 		},
 		{
-			title: '超限重量',
+			title: '超限重量(吨)',
 			dataIndex: 'excessWeight',
 			align:'center'
 		},

snowy-admin-web/src/views/biz/bizorder/form.vue

@@ -37,7 +37,7 @@
 				> </a-select>
 			</a-form-item>
 			<a-form-item label="订单重量：" name="orderWeight">
-				<a-input-number v-model:value="formData.orderWeight" style="width:90%"  :precision="2" :min="1" :max="999999"  placeholder="请输入订单重量" allow-clear /><span style="margin-left:10px;">吨</span>
+				<a-input-number v-model:value="formData.orderWeight" style="width:90%"  :precision="2" :min="1" :max="999999"  placeholder="请输入订单重量" allow-clear disabled/><span style="margin-left:10px;">吨</span>
 			</a-form-item>
 		</a-form>
 		<template #footer>

snowy-admin-web/src/views/biz/count/orderplan.vue

@@ -116,7 +116,7 @@
 			align:'center'
 		},
 		{
-			title: '实际托运重量(吨)',
+			title: '实际拖运重量(吨)',
 			dataIndex: 'actualWeight',
 			align:'center'
 		},

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizappointmentrecord/entity/BizAppointmentRecord.java

@@ -107,7 +107,7 @@ public class BizAppointmentRecord extends CommonEntity {
 
     /**超限重量*/
     @TableField(exist = false)
-    private Integer overWeight;
+    private BigDecimal overWeight;
 
     /**订单重量校验*/
     @TableField(exist = false)

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizappointmentrecord/service/impl/BizAppointmentRecordServiceImpl.java

@@ -20,6 +20,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.PhoneUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fhs.trans.service.impl.TransService;
@@ -405,16 +406,24 @@ public class BizAppointmentRecordServiceImpl extends ServiceImpl<BizAppointmentR
     @Override
     public void auditRecord(BizAppointmentRecordEditParam bizAppointmentRecordEditParam) {
         BizAppointmentRecord bizAppointmentRecord = this.queryEntity(bizAppointmentRecordEditParam.getId());
+        UpdateWrapper<BizAppointmentRecord> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",bizAppointmentRecord.getId());
+        String status = null;
         if(ObjectUtil.isNotEmpty(bizAppointmentRecordEditParam.getAuditFlag())){
             if(StringUtils.equals(bizAppointmentRecordEditParam.getAuditFlag(),"true")){
-                bizAppointmentRecord.setStatus("2");
+                //bizAppointmentRecord.setStatus("2");
+                status = "2";
             }else{
-                bizAppointmentRecord.setStatus("3");
+                //bizAppointmentRecord.setStatus("3");
+                status = "3";
             }
-            bizAppointmentRecord.setAppointmentReason(bizAppointmentRecordEditParam.getAppointmentReason());
-            this.updateById(bizAppointmentRecord);
+            //bizAppointmentRecord.setAppointmentReason(bizAppointmentRecordEditParam.getAppointmentReason());
+            updateWrapper.set("status",status);
+            updateWrapper.set("appointment_reason",bizAppointmentRecordEditParam.getAppointmentReason());
+            //this.updateById(bizAppointmentRecord);
+            this.update(updateWrapper);
 
-            if(StringUtils.equals(bizAppointmentRecord.getStatus(),"3")){
+            if(StringUtils.equals(status,"3")){
                 sendAccount(bizAppointmentRecord,null);
             }
         }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizexcessconfig/entity/BizExcessConfig.java

@@ -43,7 +43,7 @@ public class BizExcessConfig extends CommonEntity {
 
     /** 超限重量 */
     @Schema(description = "超限重量")
-    private Integer excessWeight;
+    private BigDecimal excessWeight;
 
     /** 是否启用 */
     @Schema(description = "是否启用")

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizexcessconfig/param/BizExcessConfigAddParam.java

@@ -39,7 +39,7 @@ public class BizExcessConfigAddParam {
     /** 超限重量 */
     @Schema(description = "超限重量", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "excessWeight不能为空")
-    private Integer excessWeight;
+    private BigDecimal excessWeight;
 
     /** 是否启用 */
     @Schema(description = "是否启用")

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizexcessconfig/param/BizExcessConfigEditParam.java

@@ -44,7 +44,7 @@ public class BizExcessConfigEditParam {
     /** 超限重量 */
     @Schema(description = "超限重量", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "excessWeight不能为空")
-    private Integer excessWeight;
+    private BigDecimal excessWeight;
 
     /** 是否启用 */
     @Schema(description = "是否启用")

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizexcessconfig/service/impl/BizExcessConfigServiceImpl.java

@@ -33,6 +33,7 @@ import vip.xiaonuo.biz.modular.bizexcessconfig.param.BizExcessConfigIdParam;
 import vip.xiaonuo.biz.modular.bizexcessconfig.param.BizExcessConfigPageParam;
 import vip.xiaonuo.biz.modular.bizexcessconfig.service.BizExcessConfigService;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -48,7 +49,11 @@ public class BizExcessConfigServiceImpl extends ServiceImpl<BizExcessConfigMappe
     public Page<BizExcessConfig> page(BizExcessConfigPageParam bizExcessConfigPageParam) {
         QueryWrapper<BizExcessConfig> queryWrapper = new QueryWrapper<BizExcessConfig>().checkSqlInjection();
         queryWrapper.lambda().orderByDesc(BizExcessConfig::getCreateTime);
-        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
+        Page<BizExcessConfig> page = this.page(CommonPageRequest.defaultPage(), queryWrapper);
+        for(BizExcessConfig bizExcessConfig : page.getRecords()){
+            bizExcessConfig.setExcessWeight(bizExcessConfig.getExcessWeight().divide(new BigDecimal(1000),2,BigDecimal.ROUND_HALF_UP));
+        }
+        return page;
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -62,6 +67,7 @@ public class BizExcessConfigServiceImpl extends ServiceImpl<BizExcessConfigMappe
             throw new CommonException("该轴数已经添加过超限重量！");
         }
         BizExcessConfig bizExcessConfig = BeanUtil.toBean(bizExcessConfigAddParam, BizExcessConfig.class);
+        bizExcessConfig.setExcessWeight(bizExcessConfig.getExcessWeight().multiply(new BigDecimal(1000)));
         this.save(bizExcessConfig);
     }
 
@@ -89,6 +95,7 @@ public class BizExcessConfigServiceImpl extends ServiceImpl<BizExcessConfigMappe
             }
         }
         BeanUtil.copyProperties(bizExcessConfigEditParam, bizExcessConfig);
+        bizExcessConfig.setExcessWeight(bizExcessConfig.getExcessWeight().multiply(new BigDecimal(1000)));
         this.updateById(bizExcessConfig);
     }
 

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizorder/service/impl/BizOrderServiceImpl.java

@@ -20,6 +20,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fhs.trans.service.impl.TransService;
@@ -379,13 +380,16 @@ public class BizOrderServiceImpl extends ServiceImpl<BizOrderMapper, BizOrder> i
     @Override
     public void auditOrder(BizOrderEditParam bizOrderEditParam) {
         BizOrder bizOrder = this.queryEntity(bizOrderEditParam.getId());
+        UpdateWrapper<BizOrder> updateWrapper = new UpdateWrapper<>();
+        String status = null;
         if(ObjectUtil.isNotEmpty(bizOrderEditParam.getAuditFlag())){
             if(StringUtils.equals(bizOrderEditParam.getAuditFlag(),"true")){
                 //驳回
-                bizOrder.setOrderStatus("4");
-                bizOrder.setOrderReason(bizOrderEditParam.getOrderReason());
+                //bizOrder.setOrderStatus("4");
+                status = "4";
             }else{
-                bizOrder.setOrderStatus("7");
+                status = "7";
+                //bizOrder.setOrderStatus("7");
 
                 //销售订单结束
                 BizSaleOrder bizSaleOrder = bizSaleOrderService.getById(bizOrder.getSaleOrderInfo());
@@ -394,7 +398,11 @@ public class BizOrderServiceImpl extends ServiceImpl<BizOrderMapper, BizOrder> i
                     bizSaleOrderService.updateById(bizSaleOrder);
                 }
             }
-            this.updateById(bizOrder);
+            updateWrapper.eq("id",bizOrder.getId()).
+                    set("order_status",status).
+                    set("order_reason",bizOrderEditParam.getOrderReason());
+            //this.updateById(bizOrder);
+            this.update(updateWrapper);
         }
     }