root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
liuxy
2023-02-10 11:23:28 +08:00
parent 62c4c711a0
commit 94661cc115
9 changed files with 288 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -465,6 +465,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
// 锁住点位
JSONObject jsonPoint = WQLObject.getWQLObject("sch_base_point").query("point_code = '" + point_code + "'").uniqueResult(0);
jsonPoint.put("lock_type", "99");
jsonPoint.put("vehicle_code", vehicle_code);
WQLObject.getWQLObject("sch_base_point").update(jsonPoint);
}
result.put("status", HttpStatus.OK.value());

10
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PdaCheckServiceImpl.java
View File

@@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.utils.SecurityUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
@@ -55,6 +56,7 @@ public class PdaCheckServiceImpl implements PdaCheckService {
@Override
public JSONObject checkQueryDtl(JSONObject whereJson) {
String box_no = whereJson.getString("box_no");
JSONObject map = new JSONObject();
@@ -64,8 +66,16 @@ public class PdaCheckServiceImpl implements PdaCheckService {
JSONArray resultJSONArray = WQL.getWO("PDA_CHECK").addParamMap(map).process().getResultJSONArray(0);
// 已盘点数: 不等于生成状态
JSONArray unCheckNumArr = WQLObject.getWQLObject("ST_IVT_CheckDtl").query("check_code = '" + whereJson.getString("check_code") + "' and status <> '1'").getResultJSONArray(0);
// 未盘点数：等于生成状态
JSONArray checkNumArr = WQLObject.getWQLObject("ST_IVT_CheckDtl").query("check_code = '" + whereJson.getString("check_code") + "' and status = '1'").getResultJSONArray(0);
JSONObject jo = new JSONObject();
jo.put("data", resultJSONArray);
jo.put("check_num", unCheckNumArr.size());
jo.put("uncheck_num", checkNumArr.size());
jo.put("message", "查询成功!");
return jo;
}

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_CHECK.wql
View File

@@ -129,12 +129,14 @@
dtl.check_optname,
dtl.check_time,
dtl.remark,
sub.quanlity_in_box,
dtl.check_id,
dtl.checkdtl_id
FROM
ST_IVT_CheckDtl dtl
LEFT JOIN md_me_materialbase mater ON dtl.material_id = mater.material_id
LEFT JOIN pdm_bi_subpackagerelation sub ON sub.package_box_sn = dtl.storagevehicle_code
WHERE
dtl.status = '1'

7
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/CheckController.java
View File

@@ -87,6 +87,13 @@ public class CheckController {
checkService.insertDtl(whereJson);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PostMapping("/allInsert")
@Log("新增全部在库木箱")
@ApiOperation("新增全部在库木箱")
public ResponseEntity<Object> allInsert(@RequestBody JSONObject whereJson){
checkService.allInsert(whereJson);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@GetMapping("/getStructIvt")
@Log("查询可盘点库存")
@ApiOperation("查询可盘点库存")

5
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/CheckService.java
View File

@@ -114,4 +114,9 @@ public interface CheckService {
* 处理确认
*/
void disposeConfirm(JSONObject whereJson);
/**
* 新增全部在库木箱
*/
void allInsert(JSONObject whereJson);
}

130
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java
View File

@@ -12,6 +12,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.common.utils.SecurityUtils;
import org.nl.modules.common.utils.FileUtil;
import org.nl.modules.system.util.CodeUtil;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
@@ -215,11 +216,26 @@ public class CheckServiceImpl implements CheckService {
@Override
public JSONArray getOutBillDtl(Map whereJson) {
whereJson.put("flag", "2");
JSONArray jo = WQL.getWO("QST_IVT_CHECK")
.addParamMap((HashMap) whereJson)
.process()
.getResultJSONArray(0);
String type = MapUtil.getStr(whereJson, "type");
JSONArray jo = new JSONArray();
if (ObjectUtil.isNotEmpty(type)) {
if (StrUtil.equals(type, "1")){
// 1-已盘点
whereJson.put("flag", "22");
jo = WQL.getWO("QST_IVT_CHECK").addParamMap((HashMap) whereJson).process().getResultJSONArray(0);
} else {
// 1-未盘点
whereJson.put("flag", "222");
jo = WQL.getWO("QST_IVT_CHECK").addParamMap((HashMap) whereJson).process().getResultJSONArray(0);
}
} else {
whereJson.put("flag", "2");
jo = WQL.getWO("QST_IVT_CHECK")
.addParamMap((HashMap) whereJson)
.process()
.getResultJSONArray(0);
}
return jo;
}
@@ -666,51 +682,30 @@ public class CheckServiceImpl implements CheckService {
for (int i = 0; i < rows.size(); i++) {
JSONObject jo = rows.getJSONObject(i);
Map<String, Object> map = new LinkedHashMap<>();
map.put("盘点单号", jo.getString("check_code"));
map.put("明细序号", jo.getString("seq_no"));
map.put("库区编码", jo.getString("sect_code"));
map.put("库区名称", jo.getString("sect_name"));
map.put("货位编码", jo.getString("struct_code"));
map.put("货位名称", jo.getString("struct_name"));
map.put("载具号", jo.getString("storagevehicle_code"));
map.put("物料编码", jo.getString("material_code"));
map.put("物料名称", jo.getString("material_name"));
map.put("桶数", jo.getString("base_qty"));
map.put("盘点桶数", jo.getString("fac_qty"));
map.put("单位", jo.getString("qty_unit_name"));
String check_result = jo.getString("check_result");
if (check_result.equals("0")) {
map.put("盘点结果", "正常");
} else if (check_result.equals("1")) {
map.put("盘点结果", "盘亏");
} else if (check_result.equals("2")) {
map.put("盘点结果", "盘盈");
}
String status = jo.getString("status");
if (status.equals("01")) {
if (StrUtil.equals(status, "1")) {
map.put("状态", "生成");
} else if (status.equals("04")) {
} else if (StrUtil.equals(status, "2")) {
map.put("状态", "盘点中");
} else if (status.equals("05")) {
} else if (StrUtil.equals(status, "3")) {
map.put("状态", "已盘点");
} else if (status.equals("06")) {
} else if (StrUtil.equals(status, "4")) {
map.put("状态", "异常处理中");
} else if (status.equals("07")) {
} else if (StrUtil.equals(status, "5")) {
map.put("状态", "异常处理完成");
} else if (status.equals("99")) {
} else if (StrUtil.equals(status, "99")) {
map.put("状态", "确认完成");
}
map.put("异常处理人", jo.getString("process_optname"));
map.put("异常处理时间", jo.getString("process_time"));
String process_type = jo.getString("process_type");
if (process_type.equals("0")) {
map.put("异常处理方式", "账务为准");
} else if (process_type.equals("1")) {
map.put("异常处理方式", "实物为准");
}
map.put("盘点库区", jo.getString("sect_name"));
map.put("盘点货位", jo.getString("struct_name"));
map.put("箱号", jo.getString("storagevehicle_code"));
map.put("净重", jo.getString("base_qty"));
map.put("物料编码", jo.getString("material_code"));
map.put("物料名称", jo.getString("material_name"));
map.put("备注", jo.getString("remark"));
list.add(map);
}
//FileUtil.downloadExcel(list, response);
FileUtil.downloadExcel(list, response);
}
@Override
@@ -757,5 +752,60 @@ public class CheckServiceImpl implements CheckService {
}
}
@Override
@Transactional(rollbackFor = Exception.class)
public void allInsert(JSONObject jsonObject) {
WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_CheckMst"); // 盘点单主表
WQLObject dtlTab = WQLObject.getWQLObject("ST_IVT_CheckDtl"); // 盘点单明细表
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
Long deptId = SecurityUtils.getDeptId();
// 查找库内所有在库木箱
JSONArray dtlArr = WQL.getWO("QST_IVT_CHECK").addParam("flag", "11").addParam("stor_id", jsonObject.getString("stor_id")).process().getResultJSONArray(0);
// 插入主表
JSONObject jsonMst = new JSONObject();
jsonMst.put("check_id", IdUtil.getSnowflake(1, 1).nextId());
jsonMst.put("check_code", CodeUtil.getNewCode("PD_CODE"));
jsonMst.put("buss_type", jsonObject.getString("check_type"));
jsonMst.put("check_type", jsonObject.getString("check_type"));
jsonMst.put("stor_id", jsonObject.getLongValue("stor_id"));
jsonMst.put("stor_name", jsonObject.getString("stor_name"));
jsonMst.put("dtl_num", dtlArr.size());
jsonMst.put("create_mode", "01");
jsonMst.put("is_nok", "0");
jsonMst.put("input_optid", currentUserId);
jsonMst.put("input_optname", nickName);
jsonMst.put("input_time", DateUtil.now());
jsonMst.put("remark", jsonObject.getString("remark"));
jsonMst.put("status", "1");
jsonMst.put("sysdeptid", deptId);
jsonMst.put("syscompanyid", deptId);
mstTab.insert(jsonMst);
// 插入明细
for (int i = 0; i < dtlArr.size(); i++) {
JSONObject json = dtlArr.getJSONObject(i);
JSONObject jsonDtl = new JSONObject();
jsonDtl.put("checkdtl_id", IdUtil.getSnowflake(1, 1).nextId());
jsonDtl.put("check_id", jsonMst.getLongValue("check_id"));
jsonDtl.put("check_code", jsonMst.getString("check_code"));
jsonDtl.put("seq_no", i + 1);
jsonDtl.put("sect_id", json.getLongValue("sect_id"));
jsonDtl.put("sect_name", json.getString("sect_name"));
jsonDtl.put("struct_id", json.getLongValue("struct_id"));
jsonDtl.put("struct_name", json.getString("struct_name"));
jsonDtl.put("storagevehicle_code", json.getString("storagevehicle_code"));
jsonDtl.put("material_id", json.getLongValue("material_id"));
jsonDtl.put("qty_unit_id", json.getLongValue("measure_unit_id"));
jsonDtl.put("qty_unit_name", json.getString("qty_unit_name"));
jsonDtl.put("status", "1");
JSONObject jsonSub = WQL.getWO("PDA_CHECK").addParam("flag", "4").addParam("storagevehicle_code", json.getString("storagevehicle_code")).process().uniqueResult(0);
jsonDtl.put("base_qty", jsonSub.getDoubleValue("net_weight"));
dtlTab.insert(jsonDtl);
}
}
}

80
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql
View File

@@ -141,6 +141,56 @@
ENDQUERY
ENDIF
IF 输入.flag = "22"
QUERY
SELECT
CheckDtl.*,
struct.struct_code,
struct.sect_code,
mb.material_code,
mb.material_name,
user1.person_name AS process_optname
FROM
ST_IVT_CheckDtl CheckDtl
LEFT JOIN md_me_materialbase mb ON mb.material_id = CheckDtl.material_id
LEFT JOIN st_ivt_structattr struct ON struct.struct_id = CheckDtl.struct_id
LEFT JOIN sys_user user1 ON user1.user_id = CheckDtl.process_optid
WHERE
CheckDtl.status <> '1'
OPTION 输入.check_id <> ""
CheckDtl.check_id = 输入.check_id
ENDOPTION
order by CheckDtl.seq_no
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "222"
QUERY
SELECT
CheckDtl.*,
struct.struct_code,
struct.sect_code,
mb.material_code,
mb.material_name,
user1.person_name AS process_optname
FROM
ST_IVT_CheckDtl CheckDtl
LEFT JOIN md_me_materialbase mb ON mb.material_id = CheckDtl.material_id
LEFT JOIN st_ivt_structattr struct ON struct.struct_id = CheckDtl.struct_id
LEFT JOIN sys_user user1 ON user1.user_id = CheckDtl.process_optid
WHERE
CheckDtl.status = '1'
OPTION 输入.check_id <> ""
CheckDtl.check_id = 输入.check_id
ENDOPTION
order by CheckDtl.seq_no
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "3"
PAGEQUERY
SELECT
@@ -433,3 +483,33 @@
ENDSELECT
ENDPAGEQUERY
ENDIF
IF 输入.flag = "11"
QUERY
SELECT
MAX(attr.sect_id) AS sect_id,
MAX(attr.sect_name) AS sect_name,
MAX(attr.struct_id) AS struct_id,
MAX(attr.struct_name) AS struct_name,
MAX(attr.storagevehicle_code) AS storagevehicle_code,
MAX(mater.material_id) AS material_id,
MAX(mater.base_unit_id) AS qty_unit_id,
'KG' AS qty_unit_name
FROM
st_ivt_structivt ivt
LEFT JOIN st_ivt_structattr attr ON ivt.struct_id = attr.struct_id
LEFT JOIN md_me_materialbase mater ON ivt.material_id = mater.material_id
WHERE
attr.sect_code in ('XN01','XN11')
AND IFNULL(attr.storagevehicle_code,'') <> ''
AND attr.lock_type = '1'
OPTION 输入.stor_id <> ""
attr.stor_id = 输入.stor_id
ENDOPTION
group by attr.struct_code
ENDSELECT
ENDQUERY
ENDIF

88
lms/nladmin-ui/src/views/wms/st/inStor/check/AddDialog.vue
View File

@@ -9,11 +9,12 @@
@close="close"
>
<el-row v-show="crud.status.cu > 0" :gutter="20">
<el-col :span="20" style="border: 1px solid white">
<el-col :span="18" style="border: 1px solid white">
<span />
</el-col>
<el-col :span="4">
<el-col :span="6">
<span>
<el-button icon="el-icon-check" size="mini" :loading="showLoading" type="primary" @click="allInsert">一键保存</el-button>
<el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
<el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
</span>
@@ -89,7 +90,7 @@
</el-form>
<div class="crud-opts2">
<span class="role-span">盘点明细</span>
<span v-if="crud.status.cu > 0" class="crud-opts-right2">
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
@@ -99,10 +100,47 @@
type="primary"
icon="el-icon-plus"
size="mini"
v-if="crud.status.cu > 0"
@click="queryDtl()"
>
添加盘点物料
</el-button>
<el-button
slot="left"
class="filter-item"
type="success"
icon="el-icon-refresh"
size="mini"
:loading="showDtlLoading"
v-if="crud.status.view > 0"
@click="queryDtlCheck('1')"
>
已盘点
</el-button>
<el-button
slot="left"
class="filter-item"
type="success"
icon="el-icon-refresh"
size="mini"
:loading="showDtlLoading"
v-if="crud.status.view > 0"
@click="queryDtlCheck('2')"
>
未盘点
</el-button>
<el-button
slot="left"
class="filter-item"
type="success"
icon="el-icon-thumb"
size="mini"
:loading="showDtlLoading"
v-if="crud.status.view > 0"
@click="downdtl"
>
导出
</el-button>
</span>
</div>
@@ -123,8 +161,10 @@
<span v-if="crud.status.cu > 0">{{ scope.row.storagevehicle_code }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip v-if="crud.status.view > 0" prop="base_qty" label="净重" width="150" align="center" :formatter="crud.formatNum3"/>
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="150" align="center" />
<el-table-column prop="material_name" label="物料名称" align="center" min-width="150" show-overflow-tooltip />
<el-table-column prop="remark" v-if="crud.status.view > 0" label="备注" align="center" min-width="150" show-overflow-tooltip />
<!-- <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" width="200px" >
<template scope="scope">
<el-input v-model="scope.row.remark" size="mini" />
@@ -148,6 +188,8 @@ import AddDtl from '@/views/wms/st/inStor/check/AddDtl'
import check from '@/views/wms/st/inStor/check/check'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
import DtlViewDialog from '@/views/wms/st/inStor/check/DtlViewDialog'
import { download } from '@/api/data'
import { downloadFile } from '@/utils'
const defaultForm = {
check_code: '',
@@ -177,8 +219,11 @@ export default {
paramDtlView: '',
dtlViewShow: false,
dialogVisible: false,
showLoading: false,
showDtlLoading: false,
dtlShow: false,
flagnow: false,
paramType: '',
storId: null,
nowrow: {},
nowindex: '',
@@ -231,6 +276,15 @@ export default {
}
})
},
queryDtlCheck(type) {
// 1-已盘点，2-未盘点
this.paramType = type
this.showDtlLoading = true
check.getOutBillDtl({ 'check_id': this.form.check_id, 'type': type }).then(res => {
this.form.tableData = res
this.showDtlLoading = false
})
},
bill_statusFormat(row) {
return this.dict.label.check_dtl_status[row.status]
},
@@ -296,6 +350,34 @@ export default {
openDtlView(row) {
this.paramDtlView = row.storagevehicle_code
this.dtlViewShow = true
},
allInsert() {
if (this.form.check_type === '') {
this.crud.notify('请选择盘点单类型！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
if (this.form.stor_id === '') {
this.crud.notify('请选择仓库！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
this.showLoading = true
check.allInsert(this.form).then(res => {
this.crud.cancelCU()
this.showLoading = false
}).catch(() => {
this.showLoading = false
})
},
downdtl() {
if (this.currentRow !== null) {
crud.downloadLoading = true
download('/api/check/download', { 'type': this.paramType, 'check_id': this.form.check_id }).then(result => {
downloadFile(result, '盘点数据', 'xlsx')
crud.downloadLoading = false
}).catch(() => {
crud.downloadLoading = false
})
}
}
}
}

9
lms/nladmin-ui/src/views/wms/st/inStor/check/check.js
View File

@@ -108,4 +108,11 @@ export function disposeConfirm(data) {
data
})
}
export default { add, edit, del, getOutBillDtl, getStructIvt, getOutBillDtl2, confirm, getInvTypes, saveCheck, process0, getOutBillDis, process1, disposeConfirm }
export function allInsert(data) {
return request({
url: '/api/check/allInsert',
method: 'post',
data
})
}
export default { add, edit, del, getOutBillDtl, getStructIvt, getOutBillDtl2, confirm, getInvTypes, saveCheck, process0, getOutBillDis, process1, disposeConfirm, allInsert }