瀏覽代碼

物流订单优化

fanzherong_v 1 周之前
父節點
當前提交
f8a7525609
共有 15 個文件被更改,包括 311 次插入26 次删除
  1. 12 0
      snowy-admin-web/src/api/biz/bizOrderApi.js
  2. 20 9
      snowy-admin-web/src/views/biz/bizconfig/form.vue
  3. 18 7
      snowy-admin-web/src/views/biz/bizconfig/index.vue
  4. 55 1
      snowy-admin-web/src/views/biz/bizorder/index.vue
  5. 64 0
      snowy-admin-web/src/views/biz/bizorder/reject.vue
  6. 3 0
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizconfig/entity/BizConfig.java
  7. 3 0
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizconfig/param/BizConfigAddParam.java
  8. 3 0
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizconfig/param/BizConfigEditParam.java
  9. 46 3
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizorder/controller/BizOrderController.java
  10. 6 0
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizorder/entity/BizOrder.java
  11. 3 0
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizorder/param/BizOrderAddParam.java
  12. 6 0
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizorder/param/BizOrderEditParam.java
  13. 9 0
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizorder/service/BizOrderService.java
  14. 57 4
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizorder/service/impl/BizOrderServiceImpl.java
  15. 6 2
      snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/record/service/impl/BizRecordServiceImpl.java

+ 12 - 0
snowy-admin-web/src/api/biz/bizOrderApi.js

@@ -54,10 +54,18 @@ export default {
 	updateOrderSign(data){
 		return request('updateOrderSign',data)
 	},
+	//订单结束签名
+	endOrderSign(data){
+		return request('endOrderSign',data)
+	},
 	//订单确认
 	orderConfirm(data){
 		return request('orderConfirm',data)
 	},
+	//发货确认
+	sendConfirm(data){
+		return request('sendConfirm',data)
+	},
 	//订单审核
 	auditOrder(data){
 		return request('auditOrder',data)
@@ -70,6 +78,10 @@ export default {
 	getOrderTotal(data){
 		return request('getOrderTotal',data,'get')
 	},
+	//客户驳回
+	rejectOrder(data){
+		return request('rejectOrder',data)
+	},
 	//导出
 	exportRecordTotal(data){
 		return request('exportRecordTotal', data, 'get', {

+ 20 - 9
snowy-admin-web/src/views/biz/bizconfig/form.vue

@@ -7,21 +7,21 @@
 		@close="onClose"
 	>
 		<a-form ref="formRef" :model="formData" :rules="formRules" :wrapper-col="wrapperCol" :label-col="labelCol">
-			<a-form-item label="排队时效:" name="queueEfficiency">
+<!--			<a-form-item label="排队时效:" name="queueEfficiency">
 				<a-input-number v-model:value="formData.queueEfficiency" style="width:90%"  :precision="0" :min="1" :max="99999" placeholder="请输入排队时效" allow-clear /><span style="margin-left:10px;">分钟</span>
-			</a-form-item>
+			</a-form-item>-->
 <!--			<a-form-item label="时段下拉个数:" name="pullNumber">
 				<a-input-number v-model:value="formData.pullNumber" 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="stopDuration">
+<!--			<a-form-item label="停留时长:" name="stopDuration">
 				<a-input-number v-model:value="formData.stopDuration" style="width:90%" :precision="0" :min="1" :max="99999" placeholder="请输入停留时长" allow-clear /><span style="margin-left:10px;">分钟</span>
-			</a-form-item>
+			</a-form-item>-->
 			<a-form-item label="装卸损耗预警值:" name="lossWarn">
 				<a-input-number v-model:value="formData.lossWarn" 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="applyCount">
+<!--			<a-form-item label="预约申请数量:" name="applyCount">
 				<a-input-number v-model:value="formData.applyCount" style="width:90%"  :precision="0" :min="1" :max="99999" placeholder="请输入预约申请数量" allow-clear /><span style="margin-left:10px;">个</span>
-			</a-form-item>
+			</a-form-item>-->
 			<a-form-item label="车辆装载量:" name="loadWeight">
 				<a-input-number v-model:value="formData.loadWeight" style="width:90%"  :precision="2" :min="0.01" :max="99999" placeholder="请输入车辆装载量" allow-clear /><span style="margin-left:10px;">吨</span>
 			</a-form-item>
@@ -58,7 +58,7 @@
 					</a-radio-button>
 				</a-radio-group>
 			</a-form-item>
-			<a-form-item label="排队通知开关:" name="lineNoticeSwitch">
+<!--			<a-form-item label="排队通知开关:" name="lineNoticeSwitch">
 				<a-radio-group button-style="solid" v-model:value="formData.lineNoticeSwitch">
 					<a-radio-button value="1">
 						开启
@@ -67,8 +67,8 @@
 						关闭
 					</a-radio-button>
 				</a-radio-group>
-			</a-form-item>
-			<a-form-item label="临时预约审核开关:" name="temporaryAuditSwitch">
+			</a-form-item>-->
+<!--			<a-form-item label="临时预约审核开关:" name="temporaryAuditSwitch">
 				<a-radio-group button-style="solid" v-model:value="formData.temporaryAuditSwitch">
 					<a-radio-button value="1">
 						开启
@@ -77,6 +77,17 @@
 						关闭
 					</a-radio-button>
 				</a-radio-group>
+			</a-form-item>-->
+
+			<a-form-item label="装货点位共享开关:" name="loadSwitch">
+				<a-radio-group button-style="solid" v-model:value="formData.loadSwitch">
+					<a-radio-button value="1">
+						开启
+					</a-radio-button>
+					<a-radio-button value="2">
+						关闭
+					</a-radio-button>
+				</a-radio-group>
 			</a-form-item>
 		</a-form>
 		<template #footer>

+ 18 - 7
snowy-admin-web/src/views/biz/bizconfig/index.vue

@@ -56,6 +56,12 @@
 				<template v-if="column.dataIndex === 'loadWeight'">
 					{{record.loadWeight + '吨'}}
 				</template>
+				<template v-if="column.dataIndex === 'settleAccount'">
+					{{record.settleAccount + '元'}}
+				</template>
+				<template v-if="column.dataIndex === 'loadSwitch'">
+					{{ $TOOL.dictTypeData('biz_switch', record.loadSwitch) }}
+				</template>
 			</template>
 		</s-table>
 	</a-card>
@@ -76,21 +82,21 @@
 	const loading = ref(false)
 	const submitLoading = ref(false)
 	const columns = [
-		{
+		/*{
 			title: '排队时效',
 			dataIndex: 'queueEfficiency',
 			align:'center'
-		},
+		},*/
 		/*{
 			title: '时段下拉个数',
 			dataIndex: 'pullNumber',
 			align:'center'
 		},*/
-		{
+		/*{
 			title: '停留时长',
 			dataIndex: 'stopDuration',
 			align:'center'
-		},
+		},*/
 		{
 			title: '预约审核开关',
 			dataIndex: 'auditSwitch',
@@ -121,14 +127,19 @@
 			dataIndex: 'loadWeight',
 			align:'center'
 		},
-		{
+		/*{
 			title: '排队通知开关',
 			dataIndex: 'lineNoticeSwitch',
 			align:'center'
+		},*/
+		{
+			title: '结算基础金额',
+			dataIndex: 'settleAccount',
+			align:'center'
 		},
 		{
-			title: '临时预约审核开关',
-			dataIndex: 'temporaryAuditSwitch',
+			title: '装货点位共享开关',
+			dataIndex: 'loadSwitch',
 			align:'center'
 		},
 	]

+ 55 - 1
snowy-admin-web/src/views/biz/bizorder/index.vue

@@ -193,9 +193,21 @@
 									<a style="color:forestgreen" @click="showMore(record)">配置</a>
 								</a-menu-item>
 
-								<a-menu-item v-if="hasPerm('bizOrderEnd') && (record.orderStatus == '3' || record.orderStatus == '4')">
+								<a-menu-item v-if="hasPerm('bizOrderEnd') && (record.orderStatus == '3' || record.orderStatus == '4' || record.orderStatus == '11')">
 									<a style="color:red" @click="endRef.showModal(record.id)">结束</a>
 								</a-menu-item>
+
+								<a-menu-item v-if="hasPerm('bizOrderEndConfirm') && record.orderStatus == '10'">
+									<a style="color:orange" @click="endSignRef.show(record.id)">手签确认</a>
+								</a-menu-item>
+
+								<a-menu-item v-if="hasPerm('bizOrderEndReject') && record.orderStatus == '10'">
+									<a style="color:orangered" @click="rejectRef.showModal(record.id)">驳回</a>
+								</a-menu-item>
+
+								<a-menu-item v-if="hasPerm('bizOrderSendConfirm') && record.orderStatus == '11'">
+									<a style="color:deepskyblue" @click="sendConfirm(record.id)">发货确认</a>
+								</a-menu-item>
 							</a-menu>
 						</template>
 					</a-dropdown>
@@ -216,7 +228,9 @@
 	<Flow ref="flowRef" @successful="tableRef.refresh()" />
 	<Review ref="reviewRef" @successful="tableRef.refresh(true)" />
 	<End ref="endRef" @successful="tableRef.refresh(true)" />
+	<Reject ref="rejectRef" @successful="tableRef.refresh(true)" />
 	<XnSignName ref="XnSignNameRef" @successful="signSuccess" />
+	<XnSignName ref="endSignRef" @successful="endSignSuccess" />
 
 
 	<a-modal v-model:visible="open" title="二维码" width="600px" style="height: 700px">
@@ -344,6 +358,7 @@
 	import { required } from '@/utils/formRules'
 	import End from './end.vue'
 	import dispatch from './dispatch.vue'
+	import Reject from './reject.vue'
 
 	const editAccountFlag = ref(false)
 	const moreFlag = ref(false)
@@ -357,8 +372,10 @@
 	const dispatchRef = ref()
 	const reviewRef = ref()
 	const endRef = ref()
+	const rejectRef = ref()
 	const detailRef = ref()
 	const XnSignNameRef = ref()
+	const endSignRef = ref()
 	const submitLoading = ref(false)
 	const toolConfig = { refresh: true, height: true, columnSetting: true, striped: false }
 
@@ -524,6 +541,32 @@
 		})
 	}
 
+	//发货确认sendConfirm
+	const sendConfirm = (id) =>{
+		Modal.confirm({
+			title: '提示',
+			icon: createVNode(ExclamationCircleOutlined),
+			content: '确定发货确认吗?',
+			onOk() {
+				submitLoading.value = true
+				let params =
+					{
+						id: id
+					}
+
+				bizOrderApi
+					.sendConfirm(params)
+					.then(() => {
+						tableRef.value.refresh(true)
+					})
+					.finally(() => {
+						submitLoading.value = false
+					})
+			},
+			onCancel() {}
+		})
+	}
+
 	//提交
 	const submit = (id) =>{
 		Modal.confirm({
@@ -762,6 +805,17 @@
 		})
 	}
 
+	//订单结束客户确认
+	const endSignSuccess = (value) =>{
+		const param = {
+			id:value.id,
+			endSign: value.value
+		}
+		bizOrderApi.endOrderSign(param).then(() => {
+			tableRef.value.refresh(true)
+		})
+	}
+
 	//结束订单
 	const endOrder = (record) => {
 		/*let param = {

+ 64 - 0
snowy-admin-web/src/views/biz/bizorder/reject.vue

@@ -0,0 +1,64 @@
+<template>
+    <a-modal v-model:visible="visible" title="驳回">
+
+        <a-form ref="formRef" :label-col="labelCol" :model="formData" layout="horizontal">
+            <a-form-item v-show="false">
+                <a-input v-model:value="formData.id"></a-input>
+            </a-form-item>
+            <a-form-item
+                    label="驳回说明"
+                    name="endRemark"
+            >
+                <a-textarea v-model:value="formData.endRemark" placeholder="请输入驳回说明"
+                            :auto-size="{ minRows: 3, maxRows: 5 }"/>
+            </a-form-item>
+        </a-form>
+        <template #footer>
+            <a-spin :spinning="submitLoading">
+                <a-button type="primary" @click="onsubmit(true)">驳回</a-button>
+            </a-spin>
+        </template>
+    </a-modal>
+</template>
+<script setup>
+import {message} from 'ant-design-vue';
+import bizOrderApi from '@/api/biz/bizOrderApi'
+
+const emit = defineEmits({successful: null})
+const visible = ref(false);
+const submitLoading = ref(false)
+const labelCol = ref({span: 4})
+// 表单数据
+const formData = ref({})
+const showModal = (id) => {
+    formData.value.id = id
+    visible.value = true;
+};
+const onClose = () => {
+    formData.value = {}
+    visible.value = false
+};
+const onsubmit = (flag) => {
+    if (flag === true) {
+        if (!formData.value.endRemark) {
+            message.error('驳回时,说明信息不能为空')
+            return
+        }
+    }
+    submitLoading.value = true
+	formData.value.auditFlag = flag
+	bizOrderApi.rejectOrder(formData.value).then(() => {
+        onClose()
+        emit('successful', null)
+    }).finally(() => {
+        submitLoading.value = false
+    })
+}
+// 抛出函数
+defineExpose({
+    showModal
+})
+</script>
+<style scoped>
+
+</style>

+ 3 - 0
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizconfig/entity/BizConfig.java

@@ -78,4 +78,7 @@ public class BizConfig extends CommonEntity {
 
     /**结算金额*/
     private BigDecimal settleAccount;
+
+    /**装货点位共享开关*/
+    private String loadSwitch;
 }

+ 3 - 0
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizconfig/param/BizConfigAddParam.java

@@ -79,4 +79,7 @@ public class BizConfigAddParam {
     /**结算金额*/
     private BigDecimal settleAccount;
 
+    /**装货点位共享开关*/
+    private String loadSwitch;
+
 }

+ 3 - 0
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizconfig/param/BizConfigEditParam.java

@@ -84,4 +84,7 @@ public class BizConfigEditParam {
     /**结算金额*/
     private BigDecimal settleAccount;
 
+    /**装货点位共享开关*/
+    private String loadSwitch;
+
 }

+ 46 - 3
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizorder/controller/BizOrderController.java

@@ -202,19 +202,33 @@ public class BizOrderController {
 
 
     /**
-     * 订单签名
+     * 订单开始签名
      *
      * @author fanzherong
      * @date  2025/03/21 17:16
      */
-    @Operation(summary = "订单签名")
-    @CommonLog("订单签名")
+    @Operation(summary = "订单开始签名")
+    @CommonLog("订单开始签名")
     @PostMapping("/biz/bizorder/updateOrderSign")
     public CommonResult<String> updateOrderSign(@RequestBody @Valid BizOrderEditParam bizOrderEditParam) {
         bizOrderService.updateOrderSign(bizOrderEditParam);
         return CommonResult.ok();
     }
 
+    /**
+     * 订单结束签名
+     *
+     * @author fanzherong
+     * @date  2025/03/21 17:16
+     */
+    @Operation(summary = "订单结束签名")
+    @CommonLog("订单结束签名")
+    @PostMapping("/biz/bizorder/endOrderSign")
+    public CommonResult<String> endOrderSign(@RequestBody @Valid BizOrderEditParam bizOrderEditParam) {
+        bizOrderService.endOrderSign(bizOrderEditParam);
+        return CommonResult.ok();
+    }
+
     /**
      * 订单确认
      *
@@ -243,6 +257,35 @@ public class BizOrderController {
         return CommonResult.ok();
     }
 
+    /**
+     * 客户驳回
+     *
+     * @author fanzherong
+     * @date  2025/03/21 17:16
+     */
+    @Operation(summary = "客户驳回")
+    @CommonLog("客户驳回")
+    @PostMapping("/biz/bizorder/rejectOrder")
+    public CommonResult<String> rejectOrder(@RequestBody @Valid BizOrderEditParam bizOrderEditParam) {
+        bizOrderService.rejectOrder(bizOrderEditParam);
+        return CommonResult.ok();
+    }
+
+
+    /**
+     * 发货确认
+     *
+     * @author fanzherong
+     * @date  2025/03/21 17:16
+     */
+    @Operation(summary = "发货确认")
+    @CommonLog("发货确认")
+    @PostMapping("/biz/bizorder/sendConfirm")
+    public CommonResult<String> sendConfirm(@RequestBody @Valid BizOrderEditParam bizOrderEditParam) {
+        bizOrderService.sendConfirm(bizOrderEditParam);
+        return CommonResult.ok();
+    }
+
     /**
      * 订单审核
      *

+ 6 - 0
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizorder/entity/BizOrder.java

@@ -169,4 +169,10 @@ public class BizOrder extends CommonEntity{
     @TableField(exist = false)
     private Integer applyNumber;
 
+    /**订单结束签名确认*/
+    private String endSign;
+
+    /**结束确认时间*/
+    private Date endSignTime;
+
 }

+ 3 - 0
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizorder/param/BizOrderAddParam.java

@@ -90,4 +90,7 @@ public class BizOrderAddParam {
     /**运费单价*/
     private BigDecimal freightPrice;
 
+    /**订单结束签名确认*/
+    private String endSign;
+
 }

+ 6 - 0
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizorder/param/BizOrderEditParam.java

@@ -106,4 +106,10 @@ public class BizOrderEditParam {
     /**运费单价*/
     private BigDecimal freightPrice;
 
+    /**订单结束签名确认*/
+    private String endSign;
+
+    /**结束说明*/
+    private String endRemark;
+
 }

+ 9 - 0
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizorder/service/BizOrderService.java

@@ -108,12 +108,21 @@ public interface BizOrderService extends IService<BizOrder> {
     /***订单签名*/
     void updateOrderSign(BizOrderEditParam bizOrderEditParam);
 
+    /***订单结束签名确认*/
+    void endOrderSign(BizOrderEditParam bizOrderEditParam);
+
     /**确认*/
     void orderConfirm(BizOrderEditParam bizOrderEditParam);
 
     /**结束订单*/
     void endOrder(BizOrderEditParam bizOrderEditParam);
 
+    /**驳回订单*/
+    void rejectOrder(BizOrderEditParam bizOrderEditParam);
+
+    /**发货确认*/
+    void sendConfirm(BizOrderEditParam bizOrderEditParam);
+
     /**审核**/
     void auditOrder(BizOrderEditParam bizOrderEditParam);
 

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

@@ -43,6 +43,8 @@ import vip.xiaonuo.biz.modular.bizappointmentrecord.entity.BizAppointmentRecord;
 import vip.xiaonuo.biz.modular.bizappointmentrecord.mapper.BizAppointmentRecordMapper;
 import vip.xiaonuo.biz.modular.bizappointmentrecord.param.BizAppointmentExportResult;
 import vip.xiaonuo.biz.modular.bizappointmentrecord.service.BizAppointmentRecordService;
+import vip.xiaonuo.biz.modular.bizauditlog.entity.BizAuditLog;
+import vip.xiaonuo.biz.modular.bizauditlog.service.BizAuditLogService;
 import vip.xiaonuo.biz.modular.bizconfig.entity.BizConfig;
 import vip.xiaonuo.biz.modular.bizconfig.service.BizConfigService;
 import vip.xiaonuo.biz.modular.bizorderconfig.entity.BizOrderConfig;
@@ -71,6 +73,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.URL;
 import java.net.URLConnection;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -113,6 +116,9 @@ public class BizOrderServiceImpl extends ServiceImpl<BizOrderMapper, BizOrder> i
     @Resource
     private BizOrderSupplierService bizOrderSupplierService;
 
+    @Resource
+    private BizAuditLogService bizAuditLogService;
+
     @Resource(name = "loginUserApi")
     private SaBaseLoginUserApi loginUserApi;
 
@@ -458,6 +464,29 @@ public class BizOrderServiceImpl extends ServiceImpl<BizOrderMapper, BizOrder> i
         this.updateById(bizOrder);
     }
 
+    @Transactional
+    @Override
+    public void endOrderSign(BizOrderEditParam bizOrderEditParam) {
+        BizOrder bizOrder = this.queryEntity(bizOrderEditParam.getId());
+        if(ObjectUtil.isEmpty(bizOrderEditParam.getEndSign())){
+            throw new CommonException("签名不能为空!");
+        }
+        String endSign = bizOrderEditParam.getEndSign();
+        if(bizOrderEditParam.getEndSign().contains(StrUtil.COMMA)) {
+            endSign = StrUtil.split(endSign, StrUtil.COMMA).get(1);
+        }
+        String base64 = ImgUtil.toBase64DataUri(ImgUtil.scale(ImgUtil.toImage(endSign),
+                100, 50, null), ImgUtil.IMAGE_TYPE_PNG);
+
+        bizOrder.setEndSign(base64);
+        bizOrder.setOrderStatus("7");
+        bizOrder.setEndSignTime(new Date());
+        this.updateById(bizOrder);
+
+        //上传erp
+        sendOrderForErp(bizOrder);
+    }
+
     @Transactional
     @Override
     public void orderConfirm(BizOrderEditParam bizOrderEditParam) {
@@ -491,7 +520,7 @@ public class BizOrderServiceImpl extends ServiceImpl<BizOrderMapper, BizOrder> i
             BigDecimal result = orderBalance.divide(bizOrder.getOrderWeight(),2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
             if(result.compareTo(new BigDecimal(20)) <= 0){
                 //大于80%不需要审核
-                bizOrder.setOrderStatus("7");
+                bizOrder.setOrderStatus("10");
 
                 //销售订单结束
                 BizSaleOrder bizSaleOrder = bizSaleOrderService.getById(bizOrder.getSaleOrderInfo());
@@ -501,7 +530,7 @@ public class BizOrderServiceImpl extends ServiceImpl<BizOrderMapper, BizOrder> i
                 }
 
                 //上传订单给erp
-                sendOrderForErp(bizOrder);
+                //sendOrderForErp(bizOrder);
             }else{
                 bizOrder.setOrderStatus("5");
             }
@@ -512,6 +541,29 @@ public class BizOrderServiceImpl extends ServiceImpl<BizOrderMapper, BizOrder> i
         this.updateById(bizOrder);
     }
 
+    @Override
+    public void rejectOrder(BizOrderEditParam bizOrderEditParam) {
+        BizOrder bizOrder = this.queryEntity(bizOrderEditParam.getId());
+        //设置客户驳回状态
+        bizOrder.setOrderStatus("11");
+        this.updateById(bizOrder);
+
+        //插入审核记录
+        BizAuditLog bizAuditLog = new BizAuditLog();
+        bizAuditLog.setType("WLDD");
+        bizAuditLog.setDataId(bizOrder.getId());
+        bizAuditLog.setStatus("2");
+        bizAuditLog.setRemark(bizOrderEditParam.getEndRemark());
+        bizAuditLogService.save(bizAuditLog);
+    }
+
+    @Override
+    public void sendConfirm(BizOrderEditParam bizOrderEditParam) {
+        BizOrder bizOrder = this.queryEntity(bizOrderEditParam.getId());
+        bizOrder.setOrderStatus("4");
+        this.updateById(bizOrder);
+    }
+
     public void sendOrderForErp(BizOrder bizOrder){
         String code = null;
         String msg = null;
@@ -599,6 +651,7 @@ public class BizOrderServiceImpl extends ServiceImpl<BizOrderMapper, BizOrder> i
         }
     }
 
+    @Transactional
     @Override
     public void auditOrder(BizOrderEditParam bizOrderEditParam) {
         BizOrder bizOrder = this.queryEntity(bizOrderEditParam.getId());
@@ -610,7 +663,7 @@ public class BizOrderServiceImpl extends ServiceImpl<BizOrderMapper, BizOrder> i
                 //bizOrder.setOrderStatus("4");
                 status = "4";
             }else{
-                status = "7";
+                status = "10";
                 //bizOrder.setOrderStatus("7");
 
                 //销售订单结束
@@ -621,7 +674,7 @@ public class BizOrderServiceImpl extends ServiceImpl<BizOrderMapper, BizOrder> i
                 }
 
                 //上传订单给erp
-                sendOrderForErp(bizOrder);
+                //sendOrderForErp(bizOrder);
             }
             updateWrapper.eq("id",bizOrder.getId()).
                     set("order_status",status).

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

@@ -190,8 +190,12 @@ public class BizRecordServiceImpl extends ServiceImpl<BizRecordMapper, BizRecord
             }
 
             if(StpLoginUserUtil.getLoginUser().getRoleCodeList().contains("send")){
-                //查询装卸地点
-                queryWrapper.eq("blu.user_id",StpLoginUserUtil.getLoginUser().getId());
+                //查询系统配置装货点位共享开关  1:开启   2:关闭
+                BizConfig bizConfig = bizConfigService.getOne(new QueryWrapper<BizConfig>().lambda().last("limit 1"));
+                if(StringUtils.equals(bizConfig.getLoadSwitch(),"2")){
+                    //查询装卸地点
+                    queryWrapper.eq("blu.user_id",StpLoginUserUtil.getLoginUser().getId());
+                }
             }
         }
         if (ObjectUtil.isNotEmpty(bizRecordPageParam.getOrderName())){