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

add：如果本地无用料清单数据则在线同步数据

Browse Source
This commit is contained in:
gongbaoxiong
2024-12-16 23:08:51 +08:00
parent 7d414eaf9f
commit 6b1a3d18cc
3 changed files with 81 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/SyncReceiptProcessHandler.java
View File

@@ -170,7 +170,7 @@ public class SyncReceiptProcessHandler implements ClassProcess {
JSONObject fStockId = new JSONObject(); JSONObject fStockId = new JSONObject();
//tofix 目前都入料箱库 //tofix 目前都入料箱库
fStockId.put("FNumber", "25"); fStockId.put("FNumber", "25");
linkedMap.put("FStockId", fStockId); tempMap.put("FStockId", fStockId);
} }
} }
fEntity.clear(); fEntity.clear();

83
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
View File

@@ -1,8 +1,10 @@
package org.nl.wms.pm_manage.form_data.service.impl; package org.nl.wms.pm_manage.form_data.service.impl;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
@@ -26,15 +28,16 @@ import org.nl.wms.stor_manage.struct.service.IStIvtStructattrService;
import org.nl.wms.stor_manage.struct.service.dao.StructAssignQty; import org.nl.wms.stor_manage.struct.service.dao.StructAssignQty;
import org.nl.wms.sync_manage.service.form_mapping.ISyncFormMappingService; import org.nl.wms.sync_manage.service.form_mapping.ISyncFormMappingService;
import org.nl.wms.sync_manage.service.form_mapping.dao.SyncFormMapping; import org.nl.wms.sync_manage.service.form_mapping.dao.SyncFormMapping;
import org.nl.wms.system_manage.service.quartz.task.SyncErpBillsScheduleService;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@@ -61,11 +64,17 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
@Autowired @Autowired
private IBmFormStrucService formStrucService; private IBmFormStrucService formStrucService;
@Lazy
@Autowired @Autowired
private ISyncFormMappingService iSyncFormMappingService; private ISyncFormMappingService iSyncFormMappingService;
@Autowired @Autowired
private IStIvtStructattrService iStIvtStructattrService; private IStIvtStructattrService iStIvtStructattrService;
@Lazy
@Autowired
private SyncErpBillsScheduleService syncErpBillsScheduleService;
@Override @Override
public Integer syncFormData(String form_type, String dataString) { public Integer syncFormData(String form_type, String dataString) {
@@ -183,23 +192,23 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
Page page = PageHelper.startPage(pageQuery.getPage()+1, pageQuery.getSize()); Page page = PageHelper.startPage(pageQuery.getPage()+1, pageQuery.getSize());
page.setOrderBy("id DESC"); page.setOrderBy("id DESC");
List<PmFormDataDto> pmFormDataDtos = this.baseMapper.queryTree2(query); List<PmFormDataDto> pmFormDataDtos = this.baseMapper.queryTree2(query);
if (!CollectionUtils.isEmpty(pmFormDataDtos)){ if (!CollectionUtils.isEmpty(pmFormDataDtos)) {
List<String> parents = pmFormDataDtos.stream().map(PmFormDataDto::getId).collect(Collectors.toList()); handleFormDatas(pmFormDataDtos);
List<PmFormDataDto> childs = this.baseMapper.selectChilds(parents); } else {
if (!CollectionUtils.isEmpty(childs)){ //根据单据编号同步ERP用料清单单据
Map<String, List<PmFormDataDto>> childMap = childs.stream().collect(Collectors.groupingBy(PmFormDataDto::getParent_id)); if ("PRD_PPBOM".equals(query.getForm_type())) {
for (PmFormDataDto dataDto : pmFormDataDtos) { List<SyncFormMapping> list = iSyncFormMappingService.list(new LambdaQueryWrapper<SyncFormMapping>().eq(SyncFormMapping::getForm_type, "PRD_PPBOM"));
String productArea = dataDto.getForm_data().getString("product_area"); JSONArray mappingJson = list.get(0).getMapping_json();
dataDto.setProduct_area(productArea); String mappingString = JSON.toJSONString(mappingJson);
List<PmFormDataDto> children = childMap.get(dataDto.getId()); syncErpBillsScheduleService.syncData(mappingString, list.get(0).getForm_type(), list.get(0).getDtl_split(), query.getCode());
if (children!=null){ List<PmFormDataDto> pmFormData = this.baseMapper.queryTree2(query);
for (PmFormDataDto child : children) { if (!CollectionUtils.isEmpty(pmFormData)) {
String childProductArea = child.getForm_data().getString("product_area"); handleFormDatas(pmFormData);
child.setProduct_area(childProductArea);
}
}
dataDto.setChildren(children);
} }
com.baomidou.mybatisplus.extension.plugins.pagination.Page<PmFormDataDto> dtoPage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPages(), page.getPageSize(), page.getTotal());
dtoPage.setRecords(pmFormData);
dtoPage.setTotal(pmFormData.size());
return dtoPage;
} }
} }
com.baomidou.mybatisplus.extension.plugins.pagination.Page<PmFormDataDto> dtoPage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPages(), page.getPageSize(), page.getTotal()); com.baomidou.mybatisplus.extension.plugins.pagination.Page<PmFormDataDto> dtoPage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPages(), page.getPageSize(), page.getTotal());
@@ -207,14 +216,34 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
return dtoPage; return dtoPage;
} }
private void handleFormDatas(List<PmFormDataDto> pmFormDataDtos) {
List<String> parents = pmFormDataDtos.stream().map(PmFormDataDto::getId).collect(Collectors.toList());
List<PmFormDataDto> childs = this.baseMapper.selectChilds(parents);
if (!CollectionUtils.isEmpty(childs)) {
Map<String, List<PmFormDataDto>> childMap = childs.stream().collect(Collectors.groupingBy(PmFormDataDto::getParent_id));
for (PmFormDataDto dataDto : pmFormDataDtos) {
String productArea = dataDto.getForm_data().getString("product_area");
dataDto.setProduct_area(productArea);
List<PmFormDataDto> children = childMap.get(dataDto.getId());
if (children != null) {
for (PmFormDataDto child : children) {
String childProductArea = child.getForm_data().getString("product_area");
child.setProduct_area(childProductArea);
}
}
dataDto.setChildren(children);
}
}
}
@Override @Override
public PmFormDataDto queryErpCode(String code,String stor_code) { public PmFormDataDto queryErpCode(String code, String stor_code) {
FormDataQuery query = new FormDataQuery(); FormDataQuery query = new FormDataQuery();
query.setCode(code); query.setCode(code);
query.setStatus(new String[]{StatusEnum.FORM_STATUS.code("生成"),StatusEnum.FORM_STATUS.code("执行中")}); query.setStatus(new String[]{StatusEnum.FORM_STATUS.code("生成"), StatusEnum.FORM_STATUS.code("执行中")});
List<PmFormDataDto> pmFormDataDtos = this.baseMapper.queryTree2(query); List<PmFormDataDto> pmFormDataDtos = this.baseMapper.queryTree2(query);
if (CollectionUtils.isEmpty(pmFormDataDtos)){ if (CollectionUtils.isEmpty(pmFormDataDtos)) {
throw new BadRequestException(code+"单据编码不存在或已经完成入库"); throw new BadRequestException(code + "单据编码不存在或已经完成入库");
} }
PmFormDataDto pmFormDataDto = pmFormDataDtos.get(0); PmFormDataDto pmFormDataDto = pmFormDataDtos.get(0);
List<PmFormDataDto> childs = this.baseMapper.selectChilds(ListOf.of(pmFormDataDto.getId())); List<PmFormDataDto> childs = this.baseMapper.selectChilds(ListOf.of(pmFormDataDto.getId()));
@@ -228,21 +257,23 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
//TODO:指定仓库 //TODO:指定仓库
List<StructAssignQty> structMaterials = iStIvtStructattrService.getStructIvtAssign(collect, stor_code); List<StructAssignQty> structMaterials = iStIvtStructattrService.getStructIvtAssign(collect, stor_code);
Map<String, List<StructAssignQty>> materialMap = structMaterials.stream().collect(Collectors.groupingBy(StructAssignQty::getMaterial_id)); Map<String, List<StructAssignQty>> materialMap = structMaterials.stream().collect(Collectors.groupingBy(StructAssignQty::getMaterial_id));
child:
for (PmFormDataDto child : childs) { for (PmFormDataDto child : childs) {
String childProductArea = child.getForm_data().getString("product_area"); String childProductArea = child.getForm_data().getString("product_area");
child.setProduct_area(childProductArea); child.setProduct_area(childProductArea);
List<StructAssignQty> maps = materialMap.get(child.getMaterial_id()); List<StructAssignQty> maps = materialMap.get(child.getMaterial_id());
if (CollectionUtils.isEmpty(maps)){ if (CollectionUtils.isEmpty(maps)) {
child.setSto_qty(new BigDecimal(0)); child.setSto_qty(new BigDecimal(0));
child.setPcsn(""); child.setPcsn("");
}else { } else {
for (StructAssignQty assignQty : maps) { for (StructAssignQty assignQty : maps) {
if (child.getPcsn().equals(assignQty.getPcsn())){ if (assignQty.getPcsn().equals(child.getPcsn())) {
child.setSto_qty(assignQty.getSto_qty()); child.setSto_qty(assignQty.getSto_qty());
child.setPcsn(assignQty.getPcsn()); child.setPcsn(assignQty.getPcsn());
continue child;
} }
} }
child.setSto_qty(BigDecimal.valueOf(maps.stream().mapToInt(a->a.getSto_qty().intValue()).sum())); child.setSto_qty(BigDecimal.valueOf(maps.stream().mapToInt(a -> a.getSto_qty().intValue()).sum()));
child.setPcsn(""); child.setPcsn("");
} }
} }

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

@@ -31,6 +31,7 @@ import org.nl.wms.sync_manage.service.form_mapping.impl.SyncFormMappingServiceIm
import org.slf4j.MDC; import org.slf4j.MDC;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
@@ -60,6 +61,7 @@ public class SyncErpBillsScheduleService {
@Autowired @Autowired
private IMdMeMaterialbaseService iMdMeMaterialbaseService; private IMdMeMaterialbaseService iMdMeMaterialbaseService;
@Lazy
@Autowired @Autowired
private IPmFormDataService formDataService; private IPmFormDataService formDataService;
@@ -111,7 +113,7 @@ public class SyncErpBillsScheduleService {
for (SyncFormMapping m : list) { for (SyncFormMapping m : list) {
JSONArray mappingJson = m.getMapping_json(); JSONArray mappingJson = m.getMapping_json();
String mappingString = JSON.toJSONString(mappingJson); String mappingString = JSON.toJSONString(mappingJson);
syncData(mappingString, m.getForm_type(), m.getDtl_split()); syncData(mappingString, m.getForm_type(), m.getDtl_split(), "");
} }
} finally { } finally {
LuceneAppender.traceIdTL.remove(); LuceneAppender.traceIdTL.remove();
@@ -121,10 +123,11 @@ public class SyncErpBillsScheduleService {
/** /**
* 自动同步 * 自动同步
*/ */
public void syncData(String mappingJson, String formType, Boolean dtlSplit) { public void syncData(String mappingJson, String formType, Boolean dtlSplit, String billCode) {
boolean islock = lock.tryLock(); boolean islock = lock.tryLock();
try { try {
if (islock) { if (islock) {
ErpQuery query = new ErpQuery();
JSONArray result; JSONArray result;
Map errorMsg = new HashMap<>(); Map errorMsg = new HashMap<>();
// 获取当前日期 // 获取当前日期
@@ -132,15 +135,21 @@ public class SyncErpBillsScheduleService {
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DAY_OF_MONTH, -10); calendar.add(Calendar.DAY_OF_MONTH, -10);
String sevenDaysAgo = new SimpleDateFormat("yyyy-MM-dd").format(calendar.getTime()); String sevenDaysAgo = new SimpleDateFormat("yyyy-MM-dd").format(calendar.getTime());
String filterString = getFilterString(formType, "", sevenDaysAgo, today); String filterString;
ErpQuery query = new ErpQuery(); if (StringUtils.isNotBlank(billCode)) {
filterString = "FBillNo = '" + billCode + "'";
} else {
filterString = getFilterString(formType, "", sevenDaysAgo, today);
}
query.setFilterString(filterString); query.setFilterString(filterString);
query.setFormId(formType); query.setFormId(formType);
query.setFieldKeys("FID"); query.setFieldKeys("FID");
query.setLimit(0); query.setLimit(0);
result = erpServiceUtils.queryBills(query); result = erpServiceUtils.queryBills(query);
K3CloudApi k3CloudApi = erpServiceUtils.getCloudApi(); if (ObjectUtils.isNotEmpty(result)) {
handleBills(mappingJson, formType, dtlSplit, errorMsg, result, k3CloudApi); K3CloudApi k3CloudApi = erpServiceUtils.getCloudApi();
handleBills(mappingJson, formType, dtlSplit, errorMsg, result, k3CloudApi);
}
} }
} catch (Exception ex) { } catch (Exception ex) {
log.error("同步数据时出现异常: {}", ex.getMessage()); log.error("同步数据时出现异常: {}", ex.getMessage());
@@ -192,12 +201,14 @@ public class SyncErpBillsScheduleService {
query.setFieldKeys("FID"); query.setFieldKeys("FID");
query.setLimit(0); query.setLimit(0);
result = erpServiceUtils.queryBills(query); result = erpServiceUtils.queryBills(query);
K3CloudApi k3CloudApi = erpServiceUtils.getCloudApi(); if (ObjectUtils.isNotEmpty(result)) {
handleBills(mappingJson, formType, dtlSplit, errorMsg, result, k3CloudApi); K3CloudApi k3CloudApi = erpServiceUtils.getCloudApi();
if (!CollectionUtils.isEmpty(errorMsg)){ handleBills(mappingJson, formType, dtlSplit, errorMsg, result, k3CloudApi);
throw new BadRequestException("同步成功"+(result.size()-errorMsg.size())+"条，失败信息:"+errorMsg.toString()); }
}else { if (!CollectionUtils.isEmpty(errorMsg)) {
return "同步成功，共计"+result.size()+"条"; throw new BadRequestException("同步成功" + (result.size() - errorMsg.size()) + "条，失败信息:" + errorMsg.toString());
} else {
return "同步成功，共计" + result.size() + "条";
} }
}else { }else {
throw new BadRequestException("当前同步操作正在执行，稍后再试"); throw new BadRequestException("当前同步操作正在执行，稍后再试");