装卸货点位时间段调整

snowy-admin-web/src/views/biz/bizloadpoint/timeEditForm.vue

@@ -79,15 +79,25 @@
 			.then(() => {
 				submitLoading.value = true
 				const formDataParam = cloneDeep(formData.value)
-				bizLoadTimeApi
-					.bizLoadTimeSubmitForm(formDataParam, formDataParam.id)
-					.then(() => {
-						onClose()
-						emit('successful')
-					})
-					.finally(() => {
-						submitLoading.value = false
-					})
+				// 判断开始和结束时间
+				let beginTime = new Date(formDataParam.beginTime+":00")
+				let endTime = new Date(formDataParam.endTime+":00")
+				if(beginTime > endTime){
+					message.error('结束时间不得小于开始时间！')
+					return
+				}else{
+					formDataParam.beginTime = beginTime
+					formDataParam.endTime = endTime
+					bizLoadTimeApi
+						.bizLoadTimeSubmitForm(formDataParam, formDataParam.id)
+						.then(() => {
+							onClose()
+							emit('successful')
+						})
+						.finally(() => {
+							submitLoading.value = false
+						})
+				}
 			})
 			.catch(() => {})
 	}

snowy-admin-web/src/views/biz/bizloadtime/alreadyForm.vue

@@ -73,15 +73,25 @@
 			.then(() => {
 				submitLoading.value = true
 				const formDataParam = cloneDeep(formData.value)
-				bizLoadTimeApi
-					.bizLoadTimeSubmitForm(formDataParam, formDataParam.id)
-					.then(() => {
-						onClose()
-						emit('successful')
-					})
-					.finally(() => {
-						submitLoading.value = false
-					})
+				// 判断开始和结束时间
+				let beginTime = new Date(formDataParam.beginTime+":00")
+				let endTime = new Date(formDataParam.endTime+":00")
+				if(beginTime > endTime){
+					message.error('结束时间不得小于开始时间！')
+					return
+				}else{
+					formDataParam.beginTime = beginTime
+					formDataParam.endTime = endTime
+					bizLoadTimeApi
+						.bizLoadTimeSubmitForm(formDataParam, formDataParam.id)
+						.then(() => {
+							onClose()
+							emit('successful')
+						})
+						.finally(() => {
+							submitLoading.value = false
+						})
+				}
 			})
 			.catch(() => {})
 	}

snowy-admin-web/src/views/biz/goodsConf/editForm.vue

@@ -93,18 +93,20 @@
 					message.error('结束时间不得小于开始时间！')
 					return
 				}else{
+					formDataParam.confStartTime = confStartTime
+					formDataParam.confEndTime = confEndTime
 					// 重量 吨 转成 公斤
 					let confWeight = Number(formDataParam.confWeight) * 1000
 					formDataParam.confWeight = confWeight;
 					goodsConfApi
-					.goodsConfSubmitForm(formDataParam, formDataParam.id)
-					.then(() => {
-						onClose()
-						emit('successful')
-					})
-					.finally(() => {
-						submitLoading.value = false
-					})
+						.goodsConfSubmitForm(formDataParam, formDataParam.id)
+						.then(() => {
+							onClose()
+							emit('successful')
+						})
+						.finally(() => {
+							submitLoading.value = false
+						})
 				}
 			})
 			.catch(() => {})

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizloadtime/param/BizLoadTimeAddParam.java

@@ -37,11 +37,11 @@ public class BizLoadTimeAddParam {
 
     /** 开始时间 */
     @Schema(description = "开始时间")
-    private Date beginTime;
+    private String beginTime;
 
     /** 结束时间 */
     @Schema(description = "结束时间")
-    private Date endTime;
+    private String endTime;
 
     /** 可约次数 */
     @Schema(description = "可约次数")

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizloadtime/param/BizLoadTimeEditParam.java

@@ -40,13 +40,13 @@ public class BizLoadTimeEditParam {
     @Schema(description = "装货点位id")
     private String pointId;
 
-    /** 开始时间 */
-    @Schema(description = "开始时间")
-    private Date beginTime;
+    /** 提货开始时间 */
+    @NotBlank(message = "装货开始时间不能为空")
+    private String beginTime;
 
-    /** 结束时间 */
-    @Schema(description = "结束时间")
-    private Date endTime;
+    /** 提货结束时间 */
+    @NotBlank(message = "装货结束时间不能为空")
+    private String endTime;
 
     /** 可约次数 */
     @Schema(description = "可约次数")