From 15c0000d712dac810607c314a5966998ce440922 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 14 八月 2024 09:29:48 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java | 3 +++
admin/src/views/vehicle/cars.vue | 14 ++++++--------
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java | 29 ++++++++++++++++++++++++-----
admin/src/components/business/OperaCarsWindow.vue | 7 +++----
4 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/admin/src/components/business/OperaCarsWindow.vue b/admin/src/components/business/OperaCarsWindow.vue
index 629bc85..7441094 100644
--- a/admin/src/components/business/OperaCarsWindow.vue
+++ b/admin/src/components/business/OperaCarsWindow.vue
@@ -12,10 +12,9 @@
</el-form-item>
<el-form-item label="杞﹁締绫诲瀷" prop="type">
<el-radio-group v-model="form.type" >
- <el-radio :label="0" >鍛樺伐杞﹁締</el-radio>
- <el-radio :label="1" >瀹夋嘲鍏姟杞�</el-radio>
- <el-radio :label="2" >瀹夋嘲鐗╂祦杞�</el-radio>
- <el-radio :label="3" >甯傚叕鍙稿叕杞�</el-radio>
+ <el-radio :label="0" >瀹夋嘲鍏姟杞�</el-radio>
+ <el-radio :label="1" >瀹夋嘲鐗╂祦杞�</el-radio>
+ <el-radio :label="2" >鍏朵粬</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="閫夋嫨杞︿富锛�" prop="memberId">
diff --git a/admin/src/views/vehicle/cars.vue b/admin/src/views/vehicle/cars.vue
index e45c01d..be1ed7e 100644
--- a/admin/src/views/vehicle/cars.vue
+++ b/admin/src/views/vehicle/cars.vue
@@ -19,10 +19,9 @@
</el-form-item>
<el-form-item label="杞﹁締绫诲瀷" prop="type">
<el-select v-model="searchForm.type" @keypress.enter.native="search" clearable placeholder="杞﹁締绫诲瀷">
- <el-option label="鍛樺伐杞﹁締" value="0"></el-option>
- <el-option label="瀹夋嘲鍏姟杞�" value="1"></el-option>
- <el-option label="瀹夋嘲鐗╂祦杞�" value="2"></el-option>
- <el-option label="甯傚叕鍙稿叕杞�" value="3"></el-option>
+ <el-option label="瀹夋嘲鍏姟杞�" value="0"></el-option>
+ <el-option label="瀹夋嘲鑷湁鐗╂祦杞�" value="1"></el-option>
+ <el-option label="鍏朵粬" value="2"></el-option>
</el-select>
</el-form-item>
<section>
@@ -46,10 +45,9 @@
<el-table-column prop="code" label="杞︾墝鍙�" min-width="100px"></el-table-column>
<el-table-column label="杞﹁締绫诲瀷" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.type == 0" >鍛樺伐杞﹁締</span>
- <span v-if="row.type == 1">瀹夋嘲鍏姟杞�</span>
- <span v-if="row.type == 2" >瀹夋嘲鐗╂祦杞�</span>
- <span v-if="row.type == 3" >甯傚叕鍙稿叕杞�</span>
+ <span v-if="row.type == 0" >瀹夋嘲鍏姟杞�</span>
+ <span v-if="row.type == 1">瀹夋嘲鑷湁鐗╂祦杞�</span>
+ <span v-if="row.type == 2" >鍏朵粬</span>
</template>
</el-table-column>
<el-table-column prop="memberName" label="杞︿富濮撳悕" min-width="100px"></el-table-column>
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java
index 6abd296..ba79ab3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java
@@ -47,6 +47,9 @@
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
+ @ApiModelProperty(value = "0鏈畬鎴� 1宸插畬鎴� 2宸插彇娑�", example = "1")
+ @ExcelColumn(name="鐘舵�� 0鏈畬鎴� 1宸插畬鎴� 2宸插彇娑�")
+ private Integer status;
@ApiModelProperty(value = "澶囨敞")
@ExcelColumn(name="澶囨敞")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
index 2560fdc..86f8137 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
@@ -92,6 +92,7 @@
entity.setIocode(d.getIoCode());
entity.setJobId(job.getId());
entity.setIoQty(d.getIoQty());
+ entity.setStatus(Constants.ZERO);
entity.setRate(d.getRate());
entity.setMaterialName(d.getMaterialName());
entity.setInRepertotyCode(d.getInRepertotyCode());
@@ -131,7 +132,8 @@
job.setType(Constants.platformJobType.wxcxh);//榛樿鏄鍗忚溅鍗歌揣
job.setStatus(Constants.PlatformJobStatus.WAIT_CONFIRM.getKey());//榛樿寰呯‘璁ょ姸鎬�
Cars car = carsMapper.selectOne(new QueryWrapper<Cars>()
- .select("*,(select count(1) from platform_job b where b.plate_num='"+param.getPlateNumber()+"' and b.status in()) as jobNum")
+ .select("*,(select count(1) from platform_job b where b.plate_num='"+param.getPlateNumber()+"' and b.status in("+
+ Constants.PlatformJobStatus.LEAVED+")) as jobNum")
.lambda()
.eq(Cars::getIsdeleted,Constants.ZERO)
.eq(Cars::getType,Constants.ONE)
@@ -154,7 +156,8 @@
job.setType(Constants.platformJobType.wxczh);//榛樿鏄鍗忚溅瑁呭ソ
job.setStatus(Constants.PlatformJobStatus.WAIT_CONFIRM.getKey());//榛樿寰呯‘璁ょ姸鎬�
Cars car = carsMapper.selectOne(new QueryWrapper<Cars>()
- .select("*,(select count(1) from platform_job b where b.plate_num='"+param.getPlateNumber()+"' and b.status in()) as jobNum")
+ .select("*,(select count(1) from platform_job b where b.plate_num='"+param.getPlateNumber()+"' and b.status in("+
+ Constants.PlatformJobStatus.LEAVED+")) as jobNum")
.lambda()
.eq(Cars::getIsdeleted,Constants.ZERO)
.eq(Cars::getType,Constants.ONE)
@@ -223,6 +226,7 @@
entity.setIocode(d.getIoCode());
entity.setJobId(job.getId());
entity.setIoQty(d.getIoQty());
+ entity.setStatus(Constants.ZERO);
entity.setRate(d.getRate());
entity.setMaterialName(d.getMaterialName());
iocodeList.add(d.getIoCode());
@@ -269,11 +273,18 @@
*/
@Override
public WmsBaseResponse cancelOutbound(List<WmsActionNoticeRequest> list) {
- //TODO-------------------澶勭悊鍑哄簱鍙栨秷閫氱煡涓氬姟--------------------
if(list ==null || list.size() ==0){
return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
}
-
+ List<String> iocodeList = new ArrayList<>();
+ for(WmsActionNoticeRequest param :list){
+ iocodeList.add(param.getIoCode());
+ }
+ //鍙栨秷鍏ㄩ儴鏁版嵁鐘舵�佷负 銆愬凡鍙栨秷銆�
+ platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
+ .set(PlatformWmsDetail::getStatus,Constants.TWO)
+ .in(PlatformWmsDetail::getIocode,iocodeList)
+ .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
return returnSuccessReuslt(null);
}
/**
@@ -283,10 +294,18 @@
*/
@Override
public WmsBaseResponse doneTask(List<WmsActionNoticeRequest> list) {
- //TODO-------------------澶勭悊鍑哄叆搴撲綔涓氬畬鎴愰�氱煡涓氬姟--------------------
if(list ==null || list.size() ==0){
return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
}
+ List<String> iocodeList = new ArrayList<>();
+ for(WmsActionNoticeRequest param :list){
+ iocodeList.add(param.getIoCode());
+ }
+ //鍙栨秷鍏ㄩ儴鏁版嵁鐘舵�佷负 銆愬凡瀹屾垚銆�
+ platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
+ .set(PlatformWmsDetail::getStatus,Constants.ONE)
+ .in(PlatformWmsDetail::getIocode,iocodeList)
+ .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
return returnSuccessReuslt(null);
}
--
Gitblit v1.9.3