优化

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

@@ -94,7 +94,11 @@
 					</div>
 				</template>
 				<template v-if="column.dataIndex === 'timeInfo'">
-					<span>{{record.beginTime + '~' + record.endTime}}</span>
+<!--					<span>{{record.beginTime + '~' + record.endTime}}</span>-->
+					<div class="time-list">
+						<p>开始时间：{{ record.beginTime }}</p>
+						<p style="margin-bottom: 0">结束时间：{{ record.endTime }}</p>
+					</div>
 				</template>
 				<template v-if="column.dataIndex === 'customerInfo'">
 					<span>{{record.customerName}}</span>
@@ -169,10 +173,10 @@
 									<a-menu-item v-if="hasPerm('bizAppointmentAudit') && (record.status == '1')">
 										<a style="color: #ffaa00" @click="reviewRef.showModal(record.id)">审核</a>
 									</a-menu-item>
-									<a-menu-item v-if="hasPerm('bizAppointmentRecordEdit') && (record.status == '1' || record.status == '2')">
+									<a-menu-item v-if="hasPerm('bizAppointmentRecordEdit') && (record.status == '2')">
 										<a style="color:blue" @click="formRef.onOpen(record)" >编辑</a>
 									</a-menu-item>
-									<a-menu-item v-if="hasPerm('bizAppointmentRecordDelete') && (record.status == '1' || record.status == '2')">
+									<a-menu-item v-if="hasPerm('bizAppointmentRecordDelete') && (record.status == '2')">
 										<a style="color:red" type="link" danger size="small" @click="deleteConfig(record)">删除</a>
 									</a-menu-item>
 
@@ -261,16 +265,10 @@
 			align: 'center'
 		},
 		{
-			title: '提货开始时间',
-			dataIndex: 'beginTime',
-			align:'center',
-			width:180
-		},
-		{
-			title: '提货结束时间',
-			dataIndex: 'endTime',
+			title: '提货时间',
+			dataIndex: 'timeInfo',
 			align:'center',
-			width:180
+			width:200
 		},
 		{
 			title: '客户信息',
@@ -288,11 +286,16 @@
 			dataIndex: 'driverInfo',
 			width: 160
 		},
+		{
+			title: '车辆轴数',
+			dataIndex: 'axleNumber',
+			width: 110
+		},
 		{
 			title: '状态',
 			dataIndex: 'status',
 			align: 'center',
-			width:150
+			width:130
 		},
 	]
 	// 操作栏通过权限判断是否显示

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="0" :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 /><span style="margin-left:10px;">吨</span>
 			</a-form-item>
 		</a-form>
 		<template #footer>

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

@@ -152,7 +152,7 @@
 									<a style="color:blue" size="small" type="link" @click="formRef.onOpen(record)" >编辑</a>
 								</a-menu-item>
 
-								<a-menu-item v-if="hasPerm('bizOrderDelete') && (record.orderStatus == '0' || record.orderStatus == '1')">
+								<a-menu-item v-if="hasPerm('bizOrderDelete') && (record.orderStatus == '0')">
 									<a style="color:red" size="small" type="link" @click="deleteConfig(record)">删除</a>
 								</a-menu-item>
 
@@ -172,7 +172,7 @@
 									<a style="color:green" @click="reviewRef.showModal(record.id)">审核</a>
 								</a-menu-item>
 
-								<a-menu-item v-if="hasPerm('bizOrderFlow')">
+								<a-menu-item v-if="hasPerm('bizOrderFlow') && (record.orderStatus == '4' || record.orderStatus=='5' || record.orderStatus=='6' || record.orderStatus=='7')">
 									<a style="color:deepskyblue" @click="flowRef.onOpen(record)">流水</a>
 								</a-menu-item>
 
@@ -180,7 +180,7 @@
 									<a style="color:forestgreen" @click="showMore(record)">配置</a>
 								</a-menu-item>
 
-								<a-menu-item v-if="hasPerm('bizOrderEnd') && (record.orderStatus != '5' && record.orderStatus != '6' && record.orderStatus != '7')">
+								<a-menu-item v-if="hasPerm('bizOrderEnd') && (record.orderStatus == '3' || record.orderStatus == '4')">
 									<a style="color:red" @click="endRef.showModal(record.id)">结束</a>
 								</a-menu-item>
 							</a-menu>
@@ -557,7 +557,8 @@
 	const getQrCode = (record) => {
 		//QRCode.toDataURL("id:"+record.id+"saleCode:"+record.saleCode, {
 		let param = {
-			id:record.id
+			id:record.id,
+			orderName:record.orderName
 		}
 		QRCode.toDataURL(JSON.stringify(param), {
 			errorCorrectionLevel: 'H',

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

@@ -15,7 +15,7 @@
 			</a-form-item>
 			<a-form-item label="客户信息：" name="customerId">
 				<a-select v-model:value="formData.customerId" placeholder="请选择客户信息"
-						  :options="customerIdList" @change="onChangeCustomer"
+						  :options="customerIdList"
 				> </a-select>
 			</a-form-item>
 			<a-form-item label="订单类型：" name="saleOrderType">
@@ -28,8 +28,11 @@
 					</a-radio-button>
 				</a-radio-group>
 			</a-form-item>
-			<a-form-item label="货品名称：" name="saleGoodsName">
-				<a-input v-model:value="formData.saleGoodsName" placeholder="请输入货品名称" allow-clear />
+			<a-form-item label="货品信息：" name="saleGoodsCode">
+<!--				<a-input v-model:value="formData.saleGoodsName" placeholder="请输入货品名称" allow-clear />-->
+				<a-select v-model:value="formData.saleGoodsCode" placeholder="请选择货品信息"
+						  :options="saleGoodsCodeList"
+				> </a-select>
 			</a-form-item>
 			<a-form-item label="订单重量：" name="saleOrderWeight">
 				<a-input-number v-model:value="formData.saleOrderWeight" style="width:90%"  :precision="0" :min="1" :max="999999"  placeholder="请输入订单重量" allow-clear /><span style="margin-left:10px;">吨</span>
@@ -47,6 +50,7 @@
 	import { required } from '@/utils/formRules'
 	import bizSaleOrderApi from '@/api/biz/bizSaleOrderApi'
 	import customerApi from '@/api/biz/customerApi'
+	import bizGoodsApi from "@/api/biz/bizGoodsApi";
 	// 抽屉状态
 	const open = ref(false)
 	const emit = defineEmits({ successful: null })
@@ -60,6 +64,7 @@
 	const wrapperCol = ref({ span: 16})
 
 	const customerIdList = ref()
+	const saleGoodsCodeList = ref()
 
 	// 打开抽屉
 	const onOpen = (record) => {
@@ -80,6 +85,15 @@
 				}
 			})
 		})
+		//查询货品信息
+		bizGoodsApi.getList().then((res)=>{
+			saleGoodsCodeList.value = res.map((item)=>{
+				return{
+					value:item.goodsCode,
+					label:item.goodsName+'-'+item.goodsCode
+				}
+			})
+		})
 	}
 	// 关闭抽屉
 	const onClose = () => {
@@ -92,7 +106,7 @@
 		saleOrderNumber: [required('请输入销售订单编号')],
 		saleOrderName: [required('请输入销售订单名称')],
 		saleOrderType: [required('请选择订单类型')],
-		saleGoodsName: [required('请输入货品名称')],
+		saleGoodsCode: [required('请选择货品信息')],
 		saleOrderWeight: [required('请输入销售订单重量')],
 		customerId: [required('请选择客户信息')],
 	}

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

@@ -57,8 +57,8 @@
 			<template #bodyCell="{ column, record }">
 				<template v-if="column.dataIndex === 'action'">
 					<a-space>
-						<a @click="formRef.onOpen(record)" v-if="hasPerm('bizSaleOrderEdit')">编辑</a>
-						<a-divider type="vertical" v-if="hasPerm(['bizSaleOrderEdit', 'bizSaleOrderDelete'], 'and')" />
+						<a @click="formRef.onOpen(record)" v-if="hasPerm('bizSaleOrderEdit') && record.saleStatus == '1'">编辑</a>
+						<a-divider type="vertical" v-if="hasPerm(['bizSaleOrderEdit', 'bizSaleOrderDelete'], 'and') && record.saleStatus == '1'" />
 						<a-button style="color:red" type="link" danger size="small" v-if="hasPerm('bizSaleOrderDelete')" @click="deleteConfig(record)">删除</a-button>
 					</a-space>
 				</template>

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

@@ -169,8 +169,8 @@
 				<template v-if="column.dataIndex === 'action'">
 					<a-space>
 						<a @click="detailRef.onOpen(record)">详情</a>
-						<a-divider type="vertical"  v-if="hasPerm('bizRecordConfirm') && record.confirmUser==null " />
-						<a  @click="confirmRecord(record)" v-if="hasPerm('bizRecordConfirm') && record.confirmUser==null ">确认</a>
+						<a-divider type="vertical"  v-if="hasPerm('bizRecordConfirm') && record.status=='6' " />
+						<a  @click="confirmRecord(record)" v-if="hasPerm('bizRecordConfirm') && record.status=='6' ">确认</a>
 					</a-space>
 				</template>
 			</template>

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

@@ -116,4 +116,8 @@ public class BizAppointmentRecord extends CommonEntity {
     @TableField(exist = false)
     /**车辆轴数*/
     private Integer axleNumber;
+
+    /**过磅记录id*/
+    @TableField(exist = false)
+    private String recordId;
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizappointmentrecord/mapper/mapping/BizAppointmentRecordMapper.xml

@@ -20,13 +20,15 @@
             bar.status,
             bar.appointment_reason,
             bar.over_id,
-            bec.vehicle_axle_number axleNumber
+            bec.vehicle_axle_number axleNumber,
+            br.id recordId
         from biz_appointment_record bar
          left join biz_order bo on bar.order_id = bo.id
          left join biz_goods bg on bg.id = bo.good_id
          left join biz_goods_conf bgc on bgc.id = bar.time_id
          left join biz_customer bc on bc.id = bo.customer_id
          left join biz_excess_config bec on bec.id = bar.over_id
+         left join biz_record br on bar.id = br.appointment_id
         ${ew.customSqlSegment}
     </select>
     <select id="getRecord"

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizorderconfig/service/impl/BizOrderConfigServiceImpl.java

@@ -70,6 +70,9 @@ public class BizOrderConfigServiceImpl extends ServiceImpl<BizOrderConfigMapper,
     @Override
     public void edit(BizOrderConfigEditParam bizOrderConfigEditParam) {
         BizOrderConfig bizOrderConfig = this.queryEntity(bizOrderConfigEditParam.getId());
+        if(bizOrderConfigEditParam.getApplyNumber()<=bizOrderConfig.getApplyNumberAlready()){
+            throw new CommonException("申请数量必须大于已约数量！");
+        }
         BeanUtil.copyProperties(bizOrderConfigEditParam, bizOrderConfig);
         this.updateById(bizOrderConfig);
     }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsaleorder/entity/BizSaleOrder.java

@@ -67,4 +67,7 @@ public class BizSaleOrder extends CommonEntity {
     /**客户名称*/
     private String customerName;
 
+    /**货品编码*/
+    private String saleGoodsCode;
+
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsaleorder/mapper/mapping/BizSaleOrderMapper.xml

@@ -12,7 +12,8 @@
             bso.sale_order_weight/1000 sale_order_weight,
             bso.sale_status,
             bso.customer_id,
-            bc.name customerName
+            bc.name customerName,
+            bso.sale_goods_code
         from biz_sale_order bso
         left join biz_customer bc on bc.id = bso.customer_id
         ${ew.customSqlSegment}

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsaleorder/param/BizSaleOrderAddParam.java

@@ -33,30 +33,28 @@ public class BizSaleOrderAddParam {
 
     /** 销售订单编号 */
     @Schema(description = "销售订单编号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "saleOrderNumber不能为空")
     private String saleOrderNumber;
 
     /** 销售订单名称 */
     @Schema(description = "销售订单名称", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "saleOrderName不能为空")
     private String saleOrderName;
 
     /** 订单类型（1：常规订单   2：服务订单） */
     @Schema(description = "订单类型（1：常规订单   2：服务订单）", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "saleOrderType不能为空")
     private String saleOrderType;
 
     /** 货品名称 */
     @Schema(description = "货品名称", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "saleGoodsName不能为空")
     private String saleGoodsName;
 
     /** 销售订单重量 */
     @Schema(description = "销售订单重量", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "saleOrderWeight不能为空")
     private BigDecimal saleOrderWeight;
 
     /***客户id*/
     private String customerId;
 
+    /**货品编码*/
+    private String saleGoodsCode;
+
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsaleorder/param/BizSaleOrderEditParam.java

@@ -38,30 +38,28 @@ public class BizSaleOrderEditParam {
 
     /** 销售订单编号 */
     @Schema(description = "销售订单编号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "saleOrderNumber不能为空")
     private String saleOrderNumber;
 
     /** 销售订单名称 */
     @Schema(description = "销售订单名称", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "saleOrderName不能为空")
     private String saleOrderName;
 
     /** 订单类型（1：常规订单   2：服务订单） */
     @Schema(description = "订单类型（1：常规订单   2：服务订单）", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "saleOrderType不能为空")
     private String saleOrderType;
 
     /** 货品名称 */
     @Schema(description = "货品名称", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "saleGoodsName不能为空")
     private String saleGoodsName;
 
     /** 销售订单重量 */
     @Schema(description = "销售订单重量", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "saleOrderWeight不能为空")
     private BigDecimal saleOrderWeight;
 
     /***客户id*/
     private String customerId;
 
+    /**货品编码*/
+    private String saleGoodsCode;
+
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsaleorder/service/impl/BizSaleOrderServiceImpl.java

@@ -20,8 +20,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import vip.xiaonuo.biz.modular.goods.entity.BizGoods;
+import vip.xiaonuo.biz.modular.goods.service.BizGoodsService;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
@@ -33,6 +36,7 @@ import vip.xiaonuo.biz.modular.bizsaleorder.param.BizSaleOrderIdParam;
 import vip.xiaonuo.biz.modular.bizsaleorder.param.BizSaleOrderPageParam;
 import vip.xiaonuo.biz.modular.bizsaleorder.service.BizSaleOrderService;
 
+import javax.annotation.RegEx;
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -45,6 +49,9 @@ import java.util.List;
 @Service
 public class BizSaleOrderServiceImpl extends ServiceImpl<BizSaleOrderMapper, BizSaleOrder> implements BizSaleOrderService {
 
+    @Resource
+    private BizGoodsService goodsService;
+
     @Override
     public Page<BizSaleOrder> page(BizSaleOrderPageParam bizSaleOrderPageParam) {
         QueryWrapper<BizSaleOrder> queryWrapper = new QueryWrapper<BizSaleOrder>().checkSqlInjection();
@@ -78,6 +85,12 @@ public class BizSaleOrderServiceImpl extends ServiceImpl<BizSaleOrderMapper, Biz
             throw new CommonException("订单编号已经存在！");
         }
         BizSaleOrder bizSaleOrder = BeanUtil.toBean(bizSaleOrderAddParam, BizSaleOrder.class);
+        BizGoods bizGoods = goodsService.getOne(new QueryWrapper<BizGoods>().lambda()
+                .eq(BizGoods::getGoodsCode, bizSaleOrderAddParam.getSaleGoodsCode()).
+                last("limit 1"));
+        if(ObjectUtil.isNotNull(bizGoods)){
+            bizSaleOrder.setSaleGoodsName(bizGoods.getGoodsName());
+        }
         bizSaleOrder.setSaleOrderWeight(bizSaleOrderAddParam.getSaleOrderWeight().multiply(new BigDecimal(1000)));
         this.save(bizSaleOrder);
     }
@@ -95,6 +108,12 @@ public class BizSaleOrderServiceImpl extends ServiceImpl<BizSaleOrderMapper, Biz
         }
         BeanUtil.copyProperties(bizSaleOrderEditParam, bizSaleOrder);
         bizSaleOrder.setSaleOrderWeight(bizSaleOrderEditParam.getSaleOrderWeight().multiply(new BigDecimal(1000)));
+        BizGoods bizGoods = goodsService.getOne(new QueryWrapper<BizGoods>().lambda()
+                .eq(BizGoods::getGoodsCode, bizSaleOrderEditParam.getSaleGoodsCode()).
+                last("limit 1"));
+        if(ObjectUtil.isNotNull(bizGoods)){
+            bizSaleOrder.setSaleGoodsName(bizGoods.getGoodsName());
+        }
         this.updateById(bizSaleOrder);
     }
 

snowy-web-app/src/main/java/vip/xiaonuo/core/config/GlobalConfigure.java

@@ -199,7 +199,12 @@ public class GlobalConfigure implements WebMvcConfigurer {
             "/biz/user/miniAdd",
 
             /*用友推送客户接口*/
-            "/biz/customer/yongAdd"
+            "/biz/customer/yongAdd",
+
+            //微信公众号接口
+            "/api/**"
+
+
     };
 
     /**