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

opt:修复出入库单据查询时间范围问题；增加物料查；修复ERP单据同步时间范围问题；

Browse Source
This commit is contained in:
gongbaoxiong
2025-01-06 15:32:54 +08:00
parent b0210e70ae
commit 5adbe7cf5f
3 changed files with 65 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml
View File

@@ -32,7 +32,7 @@
and st_ivt_iostorinvdtl.vehicle_code = #{query.vehicles} and st_ivt_iostorinvdtl.vehicle_code = #{query.vehicles}
</if> </if>
<if test="query.material != null and query.material != ''"> <if test="query.material != null and query.material != ''">
and (md_me_materialbase.material_spec LIKE '%${query.material}%' and (md_me_materialbase.material_code LIKE '%${query.material}%'
or md_me_materialbase.material_name LIKE '%${query.material}%') or md_me_materialbase.material_name LIKE '%${query.material}%')
</if> </if>
<if test="query.product_code != null and query.product_code != ''"> <if test="query.product_code != null and query.product_code != ''">
@@ -41,6 +41,9 @@
<if test="query.source_form_code != null and query.source_form_code != ''"> <if test="query.source_form_code != null and query.source_form_code != ''">
and st_ivt_iostorinv.source_form_code = #{query.source_form_code} and st_ivt_iostorinv.source_form_code = #{query.source_form_code}
</if> </if>
<if test="query.start_time != null and query.start_time != '' and query.end_time != null and query.end_time != ''">
and st_ivt_iostorinv.create_time &gt;= #{query.start_time} and st_ivt_iostorinv.update_time &lt;= #{query.end_time}
</if>
</where> </where>
GROUP BY st_ivt_iostorinv.id order by st_ivt_iostorinv.id desc GROUP BY st_ivt_iostorinv.id order by st_ivt_iostorinv.id desc
</select> </select>

8
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java
View File

@@ -106,7 +106,7 @@ public class SyncErpBillsScheduleService {
MDC.put("requestIp", "127.0.0.1"); MDC.put("requestIp", "127.0.0.1");
MDC.put("requestTime", DateUtil.now()); MDC.put("requestTime", DateUtil.now());
LuceneAppender.traceIdTL.set(BaseCode.intToChars(IdUtil.getLongId())); LuceneAppender.traceIdTL.set(BaseCode.intToChars(IdUtil.getLongId()));
//List<SyncFormMapping> list = syncFormMappingServiceImpl.list(new LambdaQueryWrapper<SyncFormMapping>().in(SyncFormMapping::getForm_type, "BD_MATERIAL")); // List<SyncFormMapping> list = syncFormMappingServiceImpl.list(new LambdaQueryWrapper<SyncFormMapping>().in(SyncFormMapping::getForm_type, "ka7c19edf9d4b4b39b8cc4a06802163b0"));
List<BmFormStruc> strucList = bmFormStrucServiceImpl.list(new LambdaQueryWrapper<BmFormStruc>().eq(BmFormStruc::getIs_sync, "1")); List<BmFormStruc> strucList = bmFormStrucServiceImpl.list(new LambdaQueryWrapper<BmFormStruc>().eq(BmFormStruc::getIs_sync, "1"));
Set<String> structSet = strucList.stream().map(BmFormStruc::getForm_type).collect(Collectors.toSet()); Set<String> structSet = strucList.stream().map(BmFormStruc::getForm_type).collect(Collectors.toSet());
List<SyncFormMapping> list = syncFormMappingServiceImpl.list(new LambdaQueryWrapper<SyncFormMapping>().in(SyncFormMapping::getForm_type, structSet)); List<SyncFormMapping> list = syncFormMappingServiceImpl.list(new LambdaQueryWrapper<SyncFormMapping>().in(SyncFormMapping::getForm_type, structSet));
@@ -194,7 +194,7 @@ public class SyncErpBillsScheduleService {
timeStart = start; timeStart = start;
timeEnd = end; timeEnd = end;
} }
String filterString = getFilterString(formType, code, timeEnd, timeStart); String filterString = getFilterString(formType, code, timeStart, timeEnd);
ErpQuery query = new ErpQuery(); ErpQuery query = new ErpQuery();
query.setFilterString(filterString); query.setFilterString(filterString);
query.setFormId(formType); query.setFormId(formType);
@@ -222,7 +222,7 @@ public class SyncErpBillsScheduleService {
} }
} }
private static String getFilterString(String formType, String code, String timeEnd, String timeStart) { private static String getFilterString(String formType, String code, String timeStart, String timeEnd) {
String filterString; String filterString;
if (StringUtils.isNotBlank(code)) { if (StringUtils.isNotBlank(code)) {
filterString = "FBillNo = '" + code + "'"; filterString = "FBillNo = '" + code + "'";
@@ -232,7 +232,7 @@ public class SyncErpBillsScheduleService {
filterString += "AND FDocumentStatus = 'C' AND F_PMSY_BillStatus = 'A' AND F_PMSY_CreateDate >= '" + timeStart + " 00:00:00' AND F_PMSY_CreateDate <= '" + timeEnd + " 23:59:59' "; filterString += "AND FDocumentStatus = 'C' AND F_PMSY_BillStatus = 'A' AND F_PMSY_CreateDate >= '" + timeStart + " 00:00:00' AND F_PMSY_CreateDate <= '" + timeEnd + " 23:59:59' ";
} else if ("SAL_SaleOrder".equals(formType)) { } else if ("SAL_SaleOrder".equals(formType)) {
filterString += " AND FDocumentStatus = 'C' AND FCloseStatus ='A' AND FCreateDate >= '" + timeStart + " 00:00:00' and FCreateDate <= '" + timeEnd + " 23:59:59' "; filterString += " AND FDocumentStatus = 'C' AND FCloseStatus ='A' AND FCreateDate >= '" + timeStart + " 00:00:00' and FCreateDate <= '" + timeEnd + " 23:59:59' ";
} else if ("STK_TransferDirect".equals(formType)||"STK_MisDelivery".equals(formType)||"PUR_MRB".equals(formType)||"SAL_RETURNSTOCK".equals(formType)) { } else if ("STK_TransferDirect".equals(formType) || "STK_MisDelivery".equals(formType) || "PUR_MRB".equals(formType) || "SAL_RETURNSTOCK".equals(formType)) {
filterString += " AND FDocumentStatus ='B' AND FCreateDate >= '" + timeStart + " 00:00:00' and FCreateDate <= '" + timeEnd + " 23:59:59' "; filterString += " AND FDocumentStatus ='B' AND FCreateDate >= '" + timeStart + " 00:00:00' and FCreateDate <= '" + timeEnd + " 23:59:59' ";
} else { } else {
filterString += " AND FDocumentStatus = 'C' AND FCreateDate >= '" + timeStart + " 00:00:00' and FCreateDate <= '" + timeEnd + " 23:59:59' "; filterString += " AND FDocumentStatus = 'C' AND FCreateDate >= '" + timeStart + " 00:00:00' and FCreateDate <= '" + timeEnd + " 23:59:59' ";

81
wms_pro/qd/src/views/wms/stor_manage/record/index.vue
View File

@@ -20,6 +20,39 @@
class="filter-item" class="filter-item"
/> />
</el-form-item> </el-form-item>
<el-form-item label="物料编码">
<el-input
v-model="query.material_code"
clearable
style="width: 300px"
size="mini"
placeholder="请输入物料编码"
prefix-icon="el-icon-search"
class="filter-item"
/>
</el-form-item>
<el-form-item label="载具编码">
<el-input
v-model="query.vehicle_code"
clearable
style="width: 300px"
size="mini"
placeholder="请输入载具编码"
prefix-icon="el-icon-search"
class="filter-item"
/>
</el-form-item>
<el-form-item label="批次">
<el-input
v-model="query.pcsn"
clearable
style="width: 300px"
size="mini"
placeholder="请输入批次信息"
prefix-icon="el-icon-search"
class="filter-item"
/>
</el-form-item>
<el-form-item label="变动日期" prop="analyseData"> <el-form-item label="变动日期" prop="analyseData">
<el-date-picker <el-date-picker
v-model="query.datepick" v-model="query.datepick"
@@ -30,10 +63,10 @@
end-placeholder="结束日期" end-placeholder="结束日期"
/> />
</el-form-item> </el-form-item>
<rrOperation/> <rrOperation />
</el-form> </el-form>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'--> <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission"/> <crudOperation :permission="permission" />
<el-table <el-table
ref="table" ref="table"
v-loading="crud.loading" v-loading="crud.loading"
@@ -42,30 +75,30 @@
style="width: 100%;" style="width: 100%;"
@selection-change="crud.selectionChangeHandler" @selection-change="crud.selectionChangeHandler"
> >
<el-table-column type="selection" width="55"/> <el-table-column type="selection" width="55" />
<el-table-column prop="struct_code" label="仓位编码" width="150" show-tooltip-when-overflow/> <el-table-column prop="struct_code" label="仓位编码" width="150" show-tooltip-when-overflow />
<el-table-column prop="material_code" label="物料编码" width="150" show-tooltip-when-overflow/> <el-table-column prop="material_code" label="物料编码" width="150" show-tooltip-when-overflow />
<el-table-column prop="material_name" label="物料名称" width="150" show-tooltip-when-overflow/> <el-table-column prop="material_name" label="物料名称" width="150" show-tooltip-when-overflow />
<el-table-column prop="vehicle_code" label="载具编码" width="150" show-tooltip-when-overflow/> <el-table-column prop="vehicle_code" label="载具编码" width="150" show-tooltip-when-overflow />
<el-table-column prop="growth" label="是否增加库存" width="150" show-tooltip-when-overflow> <el-table-column prop="growth" label="是否增加库存" width="150" show-tooltip-when-overflow>
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.growth}} {{ scope.row.growth }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="pcsn" label="批次" min-width="150" show-tooltip-when-overflow/> <el-table-column prop="pcsn" label="批次" min-width="150" show-tooltip-when-overflow />
<el-table-column prop="qty" label="总库存" min-width="150" show-tooltip-when-overflow/> <el-table-column prop="qty" label="总库存" min-width="150" show-tooltip-when-overflow />
<el-table-column prop="frozen_qty" label="冻结库存" show-tooltip-when-overflow/> <el-table-column prop="frozen_qty" label="冻结库存" show-tooltip-when-overflow />
<el-table-column prop="change_qty" label="变动库存" show-tooltip-when-overflow/> <el-table-column prop="change_qty" label="变动库存" show-tooltip-when-overflow />
<el-table-column prop="unit_name" label="单位" show-tooltip-when-overflow/> <el-table-column prop="unit_name" label="单位" show-tooltip-when-overflow />
<el-table-column prop="vehicle_form_data" label="物料扩展信息" width="300" show-tooltip-when-overflow/> <el-table-column prop="vehicle_form_data" label="物料扩展信息" width="300" show-tooltip-when-overflow />
<el-table-column prop="source_form_type" label="单据编号" show-tooltip-when-overflow/> <el-table-column prop="source_form_type" label="单据编号" show-tooltip-when-overflow />
<el-table-column prop="source_form_id" label="单据表名" min-width="120" show-tooltip-when-overflow/> <el-table-column prop="source_form_id" label="单据表名" min-width="120" show-tooltip-when-overflow />
<el-table-column prop="task_type" show-overflow-tooltip show-tooltip-when-overflow label="变动类型"> <el-table-column prop="task_type" show-overflow-tooltip show-tooltip-when-overflow label="变动类型">
<template slot-scope="scope"> <template slot-scope="scope">
{{ statusEnum.label.TASK_TYPE[scope.row.task_type] }} {{ statusEnum.label.TASK_TYPE[scope.row.task_type] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="update_time" label="修改时间" width="120" show-tooltip-when-overflow/> <el-table-column prop="update_time" label="修改时间" width="120" show-tooltip-when-overflow />
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="操作"--> <!-- label="操作"-->
@@ -80,14 +113,14 @@
<!-- </el-table-column>--> <!-- </el-table-column>-->
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination/> <pagination />
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import curdStructIvtFlow from './curdStructIvtFlow' import curdStructIvtFlow from './curdStructIvtFlow'
import CRUD, {presenter, header, form, crud} from '@crud/crud' import CRUD, { presenter, header, form, crud } from '@crud/crud'
import rrOperation from '@crud/RR.operation' import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation' import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation' import udOperation from '@crud/UD.operation'
@@ -112,7 +145,7 @@ const defaultForm = {
export default { export default {
dicts: [], dicts: [],
name: 'StructIvtFlow', name: 'StructIvtFlow',
components: {pagination, crudOperation, rrOperation, udOperation}, components: { pagination, crudOperation, rrOperation, udOperation },
statusEnums: ['TASK_TYPE'], statusEnums: ['TASK_TYPE'],
mixins: [presenter(), header(), form(defaultForm), crud()], mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() { cruds() {
@@ -125,7 +158,7 @@ export default {
}, },
idField: 'id', idField: 'id',
sort: 'id,desc', sort: 'id,desc',
crudMethod: {...curdStructIvtFlow} crudMethod: { ...curdStructIvtFlow }
}) })
}, },
data() { data() {
@@ -139,12 +172,12 @@ export default {
methods: { methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据 // 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() { [CRUD.HOOK.beforeRefresh]() {
if (this.query.datepick){ if (this.query.datepick) {
this.query.start_time = this.query.datepick[0] this.query.start_time = this.query.datepick[0]
if (this.query.datepick.length>1){ if (this.query.datepick.length > 1) {
this.query.end_time = this.query.datepick[1] this.query.end_time = this.query.datepick[1]
} }
}else { } else {
this.query.start_time = '' this.query.start_time = ''
this.query.end_time = '' this.query.end_time = ''
} }