优化

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

@@ -25,11 +25,6 @@
 			<a-form-item label="车牌号：" name="licenseNumber">
 				<a-input v-model:value="formData.licenseNumber" placeholder="请输入车牌号" allow-clear />
 			</a-form-item>
-<!--			<a-form-item label="预约时段：" name="timeId">
-				<a-select v-model:value="formData.timeId" placeholder="请选择预约时段"
-						  :options="timeIdList"
-				> </a-select>
-			</a-form-item>-->
 			<a-form-item label="车辆轴数：" name="overId">
 				<a-select v-model:value="formData.overId" placeholder="请选择车辆轴数"
 						  :options="overIdList"

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

@@ -22,7 +22,7 @@
 			</a-form-item>
 
 			<a-form-item label="是否过磅：" name="isWeigh">
-				<a-radio-group button-style="solid" v-model:value="formData.isWeigh">
+				<a-radio-group button-style="solid" v-model:value="formData.isWeigh" @change="changeWeighValue">
 					<a-radio-button value="1">
 						是
 					</a-radio-button>
@@ -32,6 +32,12 @@
 				</a-radio-group>
 			</a-form-item>
 
+			<a-form-item label="车辆轴数：" name="overId" >
+				<a-select v-model:value="formData.overId" placeholder="请选择车辆轴数"
+						  :options="overIdList"
+				> </a-select>
+			</a-form-item>
+
 			<a-form-item label="备注：" name="remark">
 				<a-textarea v-model:value="formData.remark" placeholder="请输入备注" allow-clear />
 			</a-form-item>
@@ -48,6 +54,8 @@
 	import { required } from '@/utils/formRules'
 	import bizOtherAppointmentApi from '@/api/biz/bizOtherAppointmentApi'
 	import userApi from '@/api/biz/bizUserApi'
+	import bizExcessConfigApi from "@/api/biz/bizExcessConfigApi";
+
 	// 抽屉状态
 	const open = ref(false)
 	const emit = defineEmits({ successful: null })
@@ -60,6 +68,7 @@
 	const overIdList = ref()
 	const loadPointIdList = ref()
 	const loadTimeIdList = ref()
+	const overFlag = ref(false)
 
 	//设置表单样式
 	const labelCol = ref({ span: 5})
@@ -72,7 +81,15 @@
 			let recordData = cloneDeep(record)
 			formData.value = Object.assign({}, recordData)
 		}
-
+		//查询车辆轴数
+		bizExcessConfigApi.getList().then((res)=>{
+			overIdList.value = res.map((item)=>{
+				return{
+					value:item.id,
+					label:item.vehicleAxleNumber+'轴'
+				}
+			})
+		})
 
 	}
 
@@ -92,9 +109,6 @@
 		}
 	}
 
-
-
-
 	// 关闭抽屉
 	const onClose = () => {
 		formRef.value.resetFields()
@@ -105,7 +119,8 @@
 	const formRules = {
 		licenseNumber: [required('请输入车牌号')],
 		driverId: [required('请选择司机')],
-		isWeigh: [required('请选择是否过磅')]
+		isWeigh: [required('请选择是否过磅')],
+		overId:[required('请选择车辆轴数')],
 	}
 	// 验证并提交数据
 	const onSubmit = () => {

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

@@ -73,6 +73,9 @@
 						<p style="margin-bottom: 0">电话：{{ record.driverMobile }}</p>
 					</div>
 				</template>
+				<template v-if="column.dataIndex === 'axleNumber'">
+					{{record.axleNumber + '轴'}}
+				</template>
 
 				<template v-if="column.dataIndex === 'isWeigh'">
 					{{ $TOOL.dictTypeData('is_weigh', record.isWeigh) }}
@@ -245,6 +248,12 @@
 			width: 110,
 			align:'center'
 		},
+		{
+			title: '车辆轴数',
+			dataIndex: 'axleNumber',
+			width: 110,
+			align:'center'
+		},
 		{
 			title: '状态',
 			dataIndex: 'status',

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

@@ -40,34 +40,14 @@
 						<a-input v-model:value="searchFormState.goodsModel" placeholder="请输入规格型号" />
 					</a-form-item>
 				</a-col>
-<!--				<a-col :span="6" v-show="advanced">
-					<a-form-item label="收货单位" name="receiptCompany">
-						<a-input v-model:value="searchFormState.receiptCompany" placeholder="请输入收货单位" />
-					</a-form-item>
-				</a-col>
-				<a-col :span="6" v-show="advanced">
-					<a-form-item label="发货单位" name="shippingCompany">
-						<a-input v-model:value="searchFormState.shippingCompany" placeholder="请输入发货单位" />
-					</a-form-item>
-				</a-col>
-				<a-col :span="6" v-show="advanced">
-					<a-form-item label="运输单位" name="transportCompany">
-						<a-input v-model:value="searchFormState.transportCompany" placeholder="请输入运输单位" />
-					</a-form-item>
-				</a-col>-->
 				<a-col :span="6" v-show="advanced">
-					<a-form-item label="订单编号" name="orderNumber">
-						<a-input v-model:value="searchFormState.orderNumber" placeholder="请输入订单编号" />
+					<a-form-item label="订单编号" name="loadNumber">
+						<a-input v-model:value="searchFormState.loadNumber" placeholder="请输入订单编号" />
 					</a-form-item>
 				</a-col>
-<!--				<a-col :span="6" v-show="advanced">
-					<a-form-item label="订单名称" name="orderName">
-						<a-input v-model:value="searchFormState.orderName" placeholder="请输入订单名称" />
-					</a-form-item>
-				</a-col>-->
 				<a-col :span="6" v-show="advanced">
-					<a-form-item label="客户名称" name="customerName">
-						<a-input v-model:value="searchFormState.customerName" placeholder="请输入客户名称" />
+					<a-form-item label="客户名称" name="serviceCustomerName">
+						<a-input v-model:value="searchFormState.serviceCustomerName" placeholder="请输入客户名称" />
 					</a-form-item>
 				</a-col>
 				<a-col :span="6" v-show="advanced">
@@ -249,12 +229,12 @@
 		},*/
 		{
 			title: '订单编号',
-			dataIndex: 'orderNumber',
+			dataIndex: 'loadNumber',
 			align:'center'
 		},
 		{
 			title: '客户名称',
-			dataIndex: 'customerName',
+			dataIndex: 'serviceCustomerName',
 			align:'center'
 		},
 		{

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

@@ -251,12 +251,12 @@
 		},*/
 		{
 			title: '订单编号',
-			dataIndex: 'orderNumber',
+			dataIndex: 'loadNumber',
 			align:'center'
 		},
 		{
 			title: '客户名称',
-			dataIndex: 'customerName',
+			dataIndex: 'serviceCustomerName',
 			align:'center'
 		},
 		{

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizappointmentrecord/param/BizOtherAppointmentAddParam.java

@@ -67,5 +67,10 @@ public class BizOtherAppointmentAddParam {
     @Schema(description = "备注")
     private String remark;
 
+    /**
+     * 车辆轴数
+     */
+    private String overId;
+
 
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizappointmentrecord/param/BizOtherAppointmentEditParam.java

@@ -70,5 +70,10 @@ public class BizOtherAppointmentEditParam {
     @Schema(description = "备注")
     private String remark;
 
+    /**
+     * 车辆轴数
+     */
+    private String overId;
+
 
 }

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

@@ -61,6 +61,8 @@ import vip.xiaonuo.biz.modular.bizordersupplier.entity.BizOrderSupplier;
 import vip.xiaonuo.biz.modular.bizordersupplier.service.BizOrderSupplierService;
 import vip.xiaonuo.biz.modular.bizpipeplan.entity.BizPipePlan;
 import vip.xiaonuo.biz.modular.bizpipeplan.service.BizPipePlanService;
+import vip.xiaonuo.biz.modular.bizservicecustomer.entity.BizServiceCustomer;
+import vip.xiaonuo.biz.modular.bizservicecustomer.service.BizServiceCustomerService;
 import vip.xiaonuo.biz.modular.bizsupplier.entity.BizSupplierTransport;
 import vip.xiaonuo.biz.modular.bizsupplier.service.BizSupplierTransportService;
 import vip.xiaonuo.biz.modular.customer.entity.BizCustomer;
@@ -163,6 +165,9 @@ public class BizAppointmentRecordServiceImpl extends ServiceImpl<BizAppointmentR
     @Resource
     private BizAppointReplaceService bizAppointReplaceService;
 
+    @Resource
+    private BizServiceCustomerService bizServiceCustomerService;
+
     @Override
     public Page<BizAppointmentRecord> page(BizAppointmentRecordPageParam bizAppointmentRecordPageParam) {
         QueryWrapper<BizAppointmentRecord> queryWrapper = getQueryWrapper(bizAppointmentRecordPageParam);
@@ -866,11 +871,13 @@ public class BizAppointmentRecordServiceImpl extends ServiceImpl<BizAppointmentR
                     }
                     if (StringUtils.equals(bizAppointmentRecord.getAppointmentType(),"6")){
                         //其他预约
-                        bizAppointmentRecord.setIsFlag("1");
+                        //bizAppointmentRecord.setIsFlag("1");
+                        bizAppointmentRecord = setBizAppointmentOther(bizAppointmentRecord);
                     }
                     if (StringUtils.equals(bizAppointmentRecord.getAppointmentType(),"3")){
                         //起卸预约
-                        bizAppointmentRecord.setIsFlag("1");
+                        //bizAppointmentRecord.setIsFlag("1");
+                        bizAppointmentRecord = setBizAppointmentLoad(bizAppointmentRecord);
                     }
                 } else {
                     bizAppointmentRecord.setIsFlag("5");
@@ -891,11 +898,11 @@ public class BizAppointmentRecordServiceImpl extends ServiceImpl<BizAppointmentR
                     }
                     if (StringUtils.equals(bizAppointmentRecord.getAppointmentType(), "6")){
                         //其他预约
-                        bizAppointmentRecord.setIsFlag("1");
+                        bizAppointmentRecord = setBizAppointmentOther(bizAppointmentRecord);
                     }
                     if (StringUtils.equals(bizAppointmentRecord.getAppointmentType(), "3")){
                         //起卸预约
-                        bizAppointmentRecord.setIsFlag("1");
+                        bizAppointmentRecord = setBizAppointmentLoad(bizAppointmentRecord);
                     }
                 } else if (StringUtils.equals(bizAppointmentRecord.getStatus(), "8")) {
                     if (StringUtils.equals(bizAppointmentRecord.getAppointmentType(), "1")) {
@@ -934,7 +941,7 @@ public class BizAppointmentRecordServiceImpl extends ServiceImpl<BizAppointmentR
                     }
                     if (StringUtils.equals(bizAppointmentRecord.getAppointmentType(),"3")){
                         //起卸预约
-                        bizAppointmentRecord.setIsFlag("1");
+                        bizAppointmentRecord = setBizAppointmentLoad(bizAppointmentRecord);
                     }
                 } else {
                     if(StringUtils.equals(bizAppointmentRecord.getAppointmentType(),"4")){
@@ -952,6 +959,91 @@ public class BizAppointmentRecordServiceImpl extends ServiceImpl<BizAppointmentR
         return bizAppointmentRecord;
     }
 
+    public BizAppointmentRecord setBizAppointmentRecord(BizAppointmentRecord bizAppointmentRecord) {
+        bizAppointmentRecord.setIsFlag("1");
+        if (ObjectUtil.isNotEmpty(bizAppointmentRecord.getOrderId())) {
+            BizOrder bizOrder = bizOrderService.getById(bizAppointmentRecord.getOrderId());
+            if (ObjectUtil.isNotNull(bizOrder)) {
+                bizAppointmentRecord.setOrderBalance(bizOrder.getOrderWeight().subtract(bizOrder.getNetWeight()));
+                bizAppointmentRecord.setReceiptCompany(bizOrder.getShipAddress());
+                if (ObjectUtil.isNotEmpty(bizOrder.getGoodId())) {
+                    BizGoods bizGoods = bizGoodsService.getById(bizOrder.getGoodId());
+                    if (ObjectUtil.isNotNull(bizGoods)) {
+                        bizAppointmentRecord.setGoodsName(bizGoods.getGoodsName());
+                        bizAppointmentRecord.setGoodsModel(bizGoods.getGoodsCode());
+                    }
+                }
+                if (ObjectUtil.isNotEmpty(bizOrder.getCustomerId())) {
+                    BizCustomer bizCustomer = bizCustomerService.getById(bizOrder.getCustomerId());
+                    if (ObjectUtil.isNotNull(bizCustomer)) {
+                        bizAppointmentRecord.setShippingCompany(bizCustomer.getName());
+                    }
+                }
+            }
+        }
+        log.info("地磅端对接：overId:" + bizAppointmentRecord.getOverId());
+        if (ObjectUtil.isNotEmpty(bizAppointmentRecord.getOverId())) {
+            BizExcessConfig excessConfig = bizExcessConfigService.getById(bizAppointmentRecord.getOverId());
+            if (ObjectUtil.isNotNull(excessConfig)) {
+                bizAppointmentRecord.setOverWeight(excessConfig.getExcessWeight());
+            }
+        }
+        BizConfig bizConfig = bizConfigService.getOne(new QueryWrapper<BizConfig>().lambda().last("limit 1"));
+        if (ObjectUtil.isNotNull(bizConfig)) {
+            bizAppointmentRecord.setOrderWeightSwitch(bizConfig.getOrderWeightSwitch());
+        }
+        return bizAppointmentRecord;
+    }
+
+    public BizAppointmentRecord setBizAppointmentLoad(BizAppointmentRecord bizAppointmentRecord) {
+        bizAppointmentRecord.setIsFlag("1");
+        if (ObjectUtil.isNotEmpty(bizAppointmentRecord.getOrderId())) {
+            //查询起卸订单
+            BizLoadAppoint loadAppoint = bizLoadAppointService.getById(bizAppointmentRecord.getOrderId());
+            if (ObjectUtil.isNotNull(loadAppoint)) {
+                bizAppointmentRecord.setOrderBalance(loadAppoint.getOrderWeight().subtract(loadAppoint.getNetWeight()));
+                //bizAppointmentRecord.setReceiptCompany(bizOrder.getShipAddress());
+                if (ObjectUtil.isNotEmpty(loadAppoint.getGoodsId())) {
+                    BizGoods bizGoods = bizGoodsService.getById(loadAppoint.getGoodsId());
+                    if (ObjectUtil.isNotNull(bizGoods)) {
+                        bizAppointmentRecord.setGoodsName(bizGoods.getGoodsName());
+                        bizAppointmentRecord.setGoodsModel(bizGoods.getGoodsCode());
+                    }
+                }
+                if (ObjectUtil.isNotEmpty(loadAppoint.getCustomerId())) {
+                    BizServiceCustomer serviceCustomer = bizServiceCustomerService.getById(loadAppoint.getCustomerId());
+                    if (ObjectUtil.isNotNull(serviceCustomer)) {
+                        bizAppointmentRecord.setShippingCompany(serviceCustomer.getName());
+                    }
+                }
+            }
+        }
+        log.info("地磅端对接：overId:" + bizAppointmentRecord.getOverId());
+        if (ObjectUtil.isNotEmpty(bizAppointmentRecord.getOverId())) {
+            BizExcessConfig excessConfig = bizExcessConfigService.getById(bizAppointmentRecord.getOverId());
+            if (ObjectUtil.isNotNull(excessConfig)) {
+                bizAppointmentRecord.setOverWeight(excessConfig.getExcessWeight());
+            }
+        }
+        BizConfig bizConfig = bizConfigService.getOne(new QueryWrapper<BizConfig>().lambda().last("limit 1"));
+        if (ObjectUtil.isNotNull(bizConfig)) {
+            bizAppointmentRecord.setOrderWeightSwitch(bizConfig.getOrderWeightSwitch());
+        }
+        return bizAppointmentRecord;
+    }
+
+    public BizAppointmentRecord setBizAppointmentOther(BizAppointmentRecord bizAppointmentRecord) {
+        bizAppointmentRecord.setIsFlag("1");
+        log.info("地磅端对接：overId:" + bizAppointmentRecord.getOverId());
+        if (ObjectUtil.isNotEmpty(bizAppointmentRecord.getOverId())) {
+            BizExcessConfig excessConfig = bizExcessConfigService.getById(bizAppointmentRecord.getOverId());
+            if (ObjectUtil.isNotNull(excessConfig)) {
+                bizAppointmentRecord.setOverWeight(excessConfig.getExcessWeight());
+            }
+        }
+        return bizAppointmentRecord;
+    }
+
     @Transactional
     @Override
     public void cancelAppointmentRecord(BizAppointmentRecordIdParam bizAppointmentRecordIdParam) {
@@ -1071,41 +1163,7 @@ public class BizAppointmentRecordServiceImpl extends ServiceImpl<BizAppointmentR
         return list;
     }
 
-    public BizAppointmentRecord setBizAppointmentRecord(BizAppointmentRecord bizAppointmentRecord) {
-        bizAppointmentRecord.setIsFlag("1");
-        if (ObjectUtil.isNotEmpty(bizAppointmentRecord.getOrderId())) {
-            BizOrder bizOrder = bizOrderService.getById(bizAppointmentRecord.getOrderId());
-            if (ObjectUtil.isNotNull(bizOrder)) {
-                bizAppointmentRecord.setOrderBalance(bizOrder.getOrderWeight().subtract(bizOrder.getNetWeight()));
-                bizAppointmentRecord.setReceiptCompany(bizOrder.getShipAddress());
-                if (ObjectUtil.isNotEmpty(bizOrder.getGoodId())) {
-                    BizGoods bizGoods = bizGoodsService.getById(bizOrder.getGoodId());
-                    if (ObjectUtil.isNotNull(bizGoods)) {
-                        bizAppointmentRecord.setGoodsName(bizGoods.getGoodsName());
-                        bizAppointmentRecord.setGoodsModel(bizGoods.getGoodsCode());
-                    }
-                }
-                if (ObjectUtil.isNotEmpty(bizOrder.getCustomerId())) {
-                    BizCustomer bizCustomer = bizCustomerService.getById(bizOrder.getCustomerId());
-                    if (ObjectUtil.isNotNull(bizCustomer)) {
-                        bizAppointmentRecord.setShippingCompany(bizCustomer.getName());
-                    }
-                }
-            }
-        }
-        log.info("地磅端对接：overId:" + bizAppointmentRecord.getOverId());
-        if (ObjectUtil.isNotEmpty(bizAppointmentRecord.getOverId())) {
-            BizExcessConfig excessConfig = bizExcessConfigService.getById(bizAppointmentRecord.getOverId());
-            if (ObjectUtil.isNotNull(excessConfig)) {
-                bizAppointmentRecord.setOverWeight(excessConfig.getExcessWeight());
-            }
-        }
-        BizConfig bizConfig = bizConfigService.getOne(new QueryWrapper<BizConfig>().lambda().last("limit 1"));
-        if (ObjectUtil.isNotNull(bizConfig)) {
-            bizAppointmentRecord.setOrderWeightSwitch(bizConfig.getOrderWeightSwitch());
-        }
-        return bizAppointmentRecord;
-    }
+
 
     /**
      * 车牌号校验
@@ -1780,7 +1838,6 @@ public class BizAppointmentRecordServiceImpl extends ServiceImpl<BizAppointmentR
                 throw new CommonException("车牌号：{}已经存在【" + (String) bizAppointmentRecord.getTransMap().get("appointmentTypeName") + "】类型的有效预约记录！", licenseNumber);
             }
         }
-
     }
 
     @Override

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizloadappoint/entity/BizLoadAppoint.java

@@ -156,4 +156,10 @@ public class BizLoadAppoint extends CommonEntity {
 
     /**订单结束客户签名时间*/
     private Date endSignTime;
+
+    /**净重*/
+    private BigDecimal netWeight;
+
+    /**卸货重量**/
+    private BigDecimal loadWeight;
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizloadappointsupplier/mapper/mapping/BizLoadAppointSupplierMapper.xml

@@ -7,8 +7,8 @@
         select
             blas.id,
             bs.supplier_name,
-            blas.net_weight,
-            blas.shipping_weight
+            ifnull(blas.net_weight/1000,0) net_weight,
+            ifnull(blas.shipping_weight/1000,0) shipping_weight
         from biz_load_appoint_supplier blas
         left join biz_supplier bs on bs.id = blas.supplier_id
         ${ew.customSqlSegment}

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/record/entity/BizRecord.java

@@ -240,4 +240,12 @@ public class BizRecord extends CommonEntity {
     /**供应商名称**/
     @TableField(exist = false)
     private String supplierName;
+
+    /**起卸订单号*/
+    @TableField(exist = false)
+    private String loadNumber;
+
+    /**服务客户名称*/
+    @TableField(exist = false)
+    private String serviceCustomerName;
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/record/mapper/mapping/BizRecordMapper.xml

@@ -319,11 +319,13 @@
             br.unload_name,
             br.audit_sign,
             bo.order_name,
-            bo.order_number,
+            ifnull(bo.order_number,bla.load_number) order_number,
             bo.order_type,
-            bc.name customerName,
+            ifnull(bc.name,bsc.name) customerName,
             bar.status,
-            bs.supplier_name
+            bs.supplier_name,
+            bla.load_number,
+            bsc.name serviceCustomerName
         from biz_record br
          left join biz_appointment_record bar on bar.id = br.appointment_id
          left join biz_order bo on bo.id = br.order_id
@@ -331,6 +333,7 @@
          left join biz_load_user blu on blu.point_id = bar.load_point_id
          left join biz_supplier bs on bs.id = br.supplier_id
          left join biz_load_appoint bla on bla.id = bar.order_id
+         left join biz_service_customer bsc on bla.customer_id = bsc.id
         ${ew.customSqlSegment}
     </select>
 </mapper>

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/record/param/BizRecordPageParam.java

@@ -129,4 +129,8 @@ public class BizRecordPageParam {
 
     private String signLoad;
 
+    private String loadNumber;
+
+    private String serviceCustomerName;
+
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/record/service/impl/BizRecordServiceImpl.java

@@ -51,6 +51,10 @@ import vip.xiaonuo.biz.modular.bizconfig.entity.BizConfig;
 import vip.xiaonuo.biz.modular.bizconfig.service.BizConfigService;
 import vip.xiaonuo.biz.modular.bizexcessconfig.entity.BizExcessConfig;
 import vip.xiaonuo.biz.modular.bizexcessconfig.service.BizExcessConfigService;
+import vip.xiaonuo.biz.modular.bizloadappoint.entity.BizLoadAppoint;
+import vip.xiaonuo.biz.modular.bizloadappoint.service.BizLoadAppointService;
+import vip.xiaonuo.biz.modular.bizloadappointsupplier.entity.BizLoadAppointSupplier;
+import vip.xiaonuo.biz.modular.bizloadappointsupplier.service.BizLoadAppointSupplierService;
 import vip.xiaonuo.biz.modular.bizorder.entity.BizOrder;
 import vip.xiaonuo.biz.modular.bizorder.param.BizOrderEditParam;
 import vip.xiaonuo.biz.modular.bizorder.service.BizOrderService;
@@ -127,6 +131,12 @@ public class BizRecordServiceImpl extends ServiceImpl<BizRecordMapper, BizRecord
     @Resource
     private BizSupplierTransportService bizSupplierTransportService;
 
+    @Resource
+    private BizLoadAppointService bizLoadAppointService;
+
+    @Resource
+    private BizLoadAppointSupplierService bizLoadAppointSupplierService;
+
     @Override
     public Page<BizRecord> page(BizRecordPageParam bizRecordPageParam) {
         QueryWrapper<BizRecord> queryWrapper = getQueryWrapper(bizRecordPageParam);
@@ -208,9 +218,15 @@ public class BizRecordServiceImpl extends ServiceImpl<BizRecordMapper, BizRecord
         if (ObjectUtil.isNotEmpty(bizRecordPageParam.getOrderNumber())){
             queryWrapper.like("bo.order_number",bizRecordPageParam.getOrderNumber());
         }
+        if (ObjectUtil.isNotEmpty(bizRecordPageParam.getLoadNumber())){
+            queryWrapper.like("bla.load_number",bizRecordPageParam.getLoadNumber());
+        }
         if (ObjectUtil.isNotEmpty(bizRecordPageParam.getCustomerName())){
             queryWrapper.like("bc.name",bizRecordPageParam.getCustomerName());
         }
+        if (ObjectUtil.isNotEmpty(bizRecordPageParam.getServiceCustomerName())){
+            queryWrapper.like("bsc.name",bizRecordPageParam.getServiceCustomerName());
+        }
         if (ObjectUtil.isNotEmpty(bizRecordPageParam.getOrderId())){
             queryWrapper.eq("br.order_id",bizRecordPageParam.getOrderId());
         }
@@ -695,30 +711,60 @@ public class BizRecordServiceImpl extends ServiceImpl<BizRecordMapper, BizRecord
             }
 
             //司机确认后，修改订单重量
-            BizOrder bizOrder = bizOrderService.getById(bizRecord.getOrderId());
-            if(ObjectUtil.isNotNull(bizOrder)){
-                bizOrder.setNetWeight(bizOrder.getNetWeight().add(bizRecord.getNetWeight()));
-                bizOrderService.updateById(bizOrder);
-                log.info("司机确认修改订单出场重量成功-----");
-
-                //修改供应商出场重量
-                //查询车辆属于哪个供应商
-                BizSupplierTransport transport = bizSupplierTransportService.getOne(new QueryWrapper<BizSupplierTransport>().lambda().
-                        eq(BizSupplierTransport::getTransportNo, bizRecord.getLicensePlate()).
-                        last("limit 1"));
-                if(ObjectUtil.isNotNull(transport)){
-                    //根据物流订单和供应商查询
-                    BizOrderSupplier orderSupplier = bizOrderSupplierService.getOne(new QueryWrapper<BizOrderSupplier>().lambda().
-                            eq(BizOrderSupplier::getOrderId, bizOrder.getId()).
-                            eq(BizOrderSupplier::getSupplierId, transport.getSupplierId()).
-                            last("limit 1"));
-                    orderSupplier.setNetWeight(orderSupplier.getNetWeight().add(bizRecord.getNetWeight()));
-                    bizOrderSupplierService.updateById(orderSupplier);
-                    log.info("司机确认修改供应商出场重量成功-----");
+            if(ObjectUtil.isNotNull(appointmentRecord)){
+                if(StringUtils.equals(appointmentRecord.getAppointmentType(),"1")){
+                    BizOrder bizOrder = bizOrderService.getById(bizRecord.getOrderId());
+                    if(ObjectUtil.isNotNull(bizOrder)){
+                        bizOrder.setNetWeight(bizOrder.getNetWeight().add(bizRecord.getNetWeight()));
+                        bizOrderService.updateById(bizOrder);
+                        log.info("司机确认修改订单出场重量成功-----");
+
+                        //修改供应商出场重量
+                        //查询车辆属于哪个供应商
+                        BizSupplierTransport transport = bizSupplierTransportService.getOne(new QueryWrapper<BizSupplierTransport>().lambda().
+                                eq(BizSupplierTransport::getTransportNo, bizRecord.getLicensePlate()).
+                                last("limit 1"));
+                        if(ObjectUtil.isNotNull(transport)){
+                            //根据物流订单和供应商查询
+                            BizOrderSupplier orderSupplier = bizOrderSupplierService.getOne(new QueryWrapper<BizOrderSupplier>().lambda().
+                                    eq(BizOrderSupplier::getOrderId, bizOrder.getId()).
+                                    eq(BizOrderSupplier::getSupplierId, transport.getSupplierId()).
+                                    last("limit 1"));
+                            orderSupplier.setNetWeight(orderSupplier.getNetWeight().add(bizRecord.getNetWeight()));
+                            bizOrderSupplierService.updateById(orderSupplier);
+                            log.info("司机确认修改供应商出场重量成功-----");
+                        }
+                    }
+                }
+
+                if(StringUtils.equals(appointmentRecord.getAppointmentType(),"3")){
+                    BizLoadAppoint loadAppoint = bizLoadAppointService.getById(bizRecord.getOrderId());
+                    if(ObjectUtil.isNotNull(loadAppoint)){
+                        loadAppoint.setNetWeight(loadAppoint.getNetWeight().add(bizRecord.getNetWeight()));
+                        bizLoadAppointService.updateById(loadAppoint);
+                        log.info("司机确认修改订单出场重量成功-----");
+
+                        //修改供应商出场重量
+                        //查询车辆属于哪个供应商
+                        BizSupplierTransport transport = bizSupplierTransportService.getOne(new QueryWrapper<BizSupplierTransport>().lambda().
+                                eq(BizSupplierTransport::getTransportNo, bizRecord.getLicensePlate()).
+                                last("limit 1"));
+                        if(ObjectUtil.isNotNull(transport)){
+                            //根据物流订单和供应商查询
+                            BizLoadAppointSupplier supplier = bizLoadAppointSupplierService.getOne(new QueryWrapper<BizLoadAppointSupplier>().lambda().
+                                    eq(BizLoadAppointSupplier::getAppointId, loadAppoint.getId()).
+                                    eq(BizLoadAppointSupplier::getSupplierId, transport.getSupplierId()).
+                                    last("limit 1"));
+                            supplier.setNetWeight(supplier.getNetWeight().add(bizRecord.getNetWeight()));
+                            bizLoadAppointSupplierService.updateById(supplier);
+                            log.info("司机确认修改供应商出场重量成功-----");
+                        }
+                    }
                 }
             }
 
 
+
             if(ObjectUtil.isNotNull(appointmentRecord)){
                 log.info("mqtt回调结束：过磅记录id："+bizRecord.getRelationId()+",车牌号："+bizRecord.getLicensePlate()+",状态："+appointmentRecord.getStatus());
             }
@@ -773,37 +819,79 @@ public class BizRecordServiceImpl extends ServiceImpl<BizRecordMapper, BizRecord
             bizAppointmentRecordService.updateById(appointmentRecord);
         }
 
-        //查询物流订单信息
-        BizOrder bizOrder = bizOrderService.getById(bizRecord.getOrderId());
-        if(ObjectUtil.isNotNull(bizOrder)){
-            if(StringUtils.equals(bizOrder.getOrderType(),"1")){
-                //常规订单
-                if(ObjectUtil.isEmpty(bizOrder.getShippingWeight())){
-                    bizOrder.setShippingWeight(new BigDecimal(0));
+        if(ObjectUtil.isNotNull(appointmentRecord)){
+            //沙石预约
+            if(StringUtils.equals(appointmentRecord.getAppointmentType(),"1")){
+                //查询物流订单信息
+                BizOrder bizOrder = bizOrderService.getById(bizRecord.getOrderId());
+                if(ObjectUtil.isNotNull(bizOrder)){
+                    if(StringUtils.equals(bizOrder.getOrderType(),"1")){
+                        //常规订单
+                        if(ObjectUtil.isEmpty(bizOrder.getShippingWeight())){
+                            bizOrder.setShippingWeight(new BigDecimal(0));
+                        }
+                        bizOrder.setShippingWeight(bizOrder.getShippingWeight().add(bizRecordEditParam.getUnloadWeight().multiply(new BigDecimal(1000))));
+                        bizOrderService.updateById(bizOrder);
+                        log.info("司机确认修改销售订单卸货重量成功-----");
+
+                        //修改供应商卸货重量
+                        //查询车辆属于哪个供应商
+                        BizSupplierTransport transport = bizSupplierTransportService.getOne(new QueryWrapper<BizSupplierTransport>().lambda().
+                                eq(BizSupplierTransport::getTransportNo, bizRecord.getLicensePlate()).
+                                last("limit 1"));
+                        if(ObjectUtil.isNotNull(transport)){
+                            //根据物流订单和供应商查询
+                            BizOrderSupplier orderSupplier = bizOrderSupplierService.getOne(new QueryWrapper<BizOrderSupplier>().lambda().
+                                    eq(BizOrderSupplier::getOrderId, bizOrder.getId()).
+                                    eq(BizOrderSupplier::getSupplierId, transport.getSupplierId()).
+                                    last("limit 1"));
+                            if(ObjectUtil.isNotNull(orderSupplier)){
+                                orderSupplier.setShippingWeight(orderSupplier.getShippingWeight().add(bizRecordEditParam.getUnloadWeight().multiply(new BigDecimal(1000))));
+                                bizOrderSupplierService.updateById(orderSupplier);
+                                log.info("司机确认修改销售订单供应商卸货重量成功-----");
+                            }
+                        }
+                    }
                 }
-                bizOrder.setShippingWeight(bizOrder.getShippingWeight().add(bizRecordEditParam.getUnloadWeight().multiply(new BigDecimal(1000))));
-                bizOrderService.updateById(bizOrder);
-                log.info("司机确认修改订单卸货重量成功-----");
-
-                //修改供应商卸货重量
-                //查询车辆属于哪个供应商
-                BizSupplierTransport transport = bizSupplierTransportService.getOne(new QueryWrapper<BizSupplierTransport>().lambda().
-                        eq(BizSupplierTransport::getTransportNo, bizRecord.getLicensePlate()).
-                        last("limit 1"));
-                if(ObjectUtil.isNotNull(transport)){
-                    //根据物流订单和供应商查询
-                    BizOrderSupplier orderSupplier = bizOrderSupplierService.getOne(new QueryWrapper<BizOrderSupplier>().lambda().
-                            eq(BizOrderSupplier::getOrderId, bizOrder.getId()).
-                            eq(BizOrderSupplier::getSupplierId, transport.getSupplierId()).
-                            last("limit 1"));
-                    if(ObjectUtil.isNotNull(orderSupplier)){
-                        orderSupplier.setShippingWeight(orderSupplier.getShippingWeight().add(bizRecordEditParam.getUnloadWeight().multiply(new BigDecimal(1000))));
-                        bizOrderSupplierService.updateById(orderSupplier);
-                        log.info("司机确认修改供应商卸货重量成功-----");
+            }
+
+            //起卸预约
+            if(StringUtils.equals(appointmentRecord.getAppointmentType(),"3")){
+                //查询起卸订单信息
+                BizLoadAppoint loadAppoint = bizLoadAppointService.getById(bizRecord.getOrderId());
+                if(ObjectUtil.isNotNull(loadAppoint)){
+                    if(StringUtils.equals(loadAppoint.getOrderType(),"1")){
+                        //配送订单
+                        if(ObjectUtil.isEmpty(loadAppoint.getLoadWeight())){
+                            loadAppoint.setLoadWeight(new BigDecimal(0));
+                        }
+                        loadAppoint.setLoadWeight(loadAppoint.getLoadWeight().add(bizRecordEditParam.getUnloadWeight().multiply(new BigDecimal(1000))));
+                        bizLoadAppointService.updateById(loadAppoint);
+                        log.info("司机确认修改起卸订单卸货重量成功-----");
+
+                        //修改供应商卸货重量
+                        //查询车辆属于哪个供应商
+                        BizSupplierTransport transport = bizSupplierTransportService.getOne(new QueryWrapper<BizSupplierTransport>().lambda().
+                                eq(BizSupplierTransport::getTransportNo, bizRecord.getLicensePlate()).
+                                last("limit 1"));
+                        if(ObjectUtil.isNotNull(transport)){
+                            //根据物流订单和供应商查询
+                            BizLoadAppointSupplier supplier = bizLoadAppointSupplierService.getOne(new QueryWrapper<BizLoadAppointSupplier>().lambda().
+                                    eq(BizLoadAppointSupplier::getAppointId, loadAppoint.getId()).
+                                    eq(BizLoadAppointSupplier::getSupplierId, transport.getSupplierId()).
+                                    last("limit 1"));
+                            if(ObjectUtil.isNotNull(supplier)){
+                                supplier.setShippingWeight(supplier.getShippingWeight().add(bizRecordEditParam.getUnloadWeight().multiply(new BigDecimal(1000))));
+                                bizLoadAppointSupplierService.updateById(supplier);
+                                log.info("司机确认修改起卸订单供应商卸货重量成功-----");
+                            }
+                        }
                     }
                 }
             }
         }
+
+
     }
 
     public static void main(String[] args) {