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

opt:优化生产入库单字段排列顺序

Browse Source
This commit is contained in:
gongbaoxiong
2025-03-04 12:24:42 +08:00
parent 4d3fdeeb47
commit c9c774a18f
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,9 +131,8 @@ public class SyncReceiptProcessHandler implements ClassProcess {
throw new BadRequestException("该生产订单未找到对应生产汇报单"); throw new BadRequestException("该生产订单未找到对应生产汇报单");
} }
JSONArray optRptEntry = jsonArray.getJSONObject(0).getJSONArray("OptRptEntry"); JSONArray optRptEntry = jsonArray.getJSONObject(0).getJSONArray("OptRptEntry");
fEntity.put("FSrcEntryId", optRptEntry.getJSONObject(0).getString("Id"));
Map<String, Object> linkedMap = new LinkedHashMap<>(); Map<String, Object> linkedMap = new LinkedHashMap<>();
//移除重构源单Id
fEntity.remove("FSrcEntryId");
for (String key : fEntity.keySet()) { for (String key : fEntity.keySet()) {
linkedMap.put(key, fEntity.get(key)); linkedMap.put(key, fEntity.get(key));
} }
@@ -154,8 +153,8 @@ public class SyncReceiptProcessHandler implements ClassProcess {
fEntityLink.put("FEntity_Link_FSBillId", jsonArray.getJSONObject(0).getString("Id")); fEntityLink.put("FEntity_Link_FSBillId", jsonArray.getJSONObject(0).getString("Id"));
fEntityLink.put("FEntity_Link_FSId", optRptEntry.getJSONObject(0).getString("Id")); fEntityLink.put("FEntity_Link_FSId", optRptEntry.getJSONObject(0).getString("Id"));
fEntityLink.put("FEntity_Link_FSTableName", "T_SFC_OPTRPTENTRY"); fEntityLink.put("FEntity_Link_FSTableName", "T_SFC_OPTRPTENTRY");
fEntityLink.put("FEntity_Link_FBasePrdRealQtyOld", fEntity.getString("FMustQty")); fEntityLink.put("FEntity_Link_FBasePrdRealQtyOld", fEntity.getString("FRealQty"));
fEntityLink.put("FEntity_Link_FBasePrdRealQty", fEntity.getString("FMustQty")); fEntityLink.put("FEntity_Link_FBasePrdRealQty", fEntity.getString("FRealQty"));
fEntityLinkArray.add(fEntityLink); fEntityLinkArray.add(fEntityLink);
tempMap.put("FEntity_Link", fEntityLinkArray); tempMap.put("FEntity_Link", fEntityLinkArray);
fEntity.clear(); fEntity.clear();

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

@@ -133,7 +133,7 @@ public class SyncErpBillsScheduleService {
// 获取当前日期 // 获取当前日期
String today = new SimpleDateFormat("yyyy-MM-dd").format(new Date()); String today = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DAY_OF_MONTH, -10); calendar.add(Calendar.DAY_OF_MONTH, -80);
String sevenDaysAgo = new SimpleDateFormat("yyyy-MM-dd").format(calendar.getTime()); String sevenDaysAgo = new SimpleDateFormat("yyyy-MM-dd").format(calendar.getTime());
String filterString; String filterString;
if (StringUtils.isNotBlank(billCode)) { if (StringUtils.isNotBlank(billCode)) {
@@ -188,7 +188,7 @@ public class SyncErpBillsScheduleService {
// 获取当前日期 // 获取当前日期
String timeEnd = new SimpleDateFormat("yyyy-MM-dd").format(new Date()); String timeEnd = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DAY_OF_MONTH, -10); calendar.add(Calendar.DAY_OF_MONTH, -80);
String timeStart = new SimpleDateFormat("yyyy-MM-dd").format(calendar.getTime()); String timeStart = new SimpleDateFormat("yyyy-MM-dd").format(calendar.getTime());
if (StringUtils.isNotBlank(start) && StringUtils.isNotBlank(end)) { if (StringUtils.isNotBlank(start) && StringUtils.isNotBlank(end)) {
timeStart = start; timeStart = start;
@@ -302,11 +302,13 @@ public class SyncErpBillsScheduleService {
if (StringUtils.isBlank(f.getCode())) { if (StringUtils.isBlank(f.getCode())) {
PmFormData existDtlData = formDataService.getOne(new QueryWrapper<PmFormData>().eq("id",id).select("qty")); PmFormData existDtlData = formDataService.getOne(new QueryWrapper<PmFormData>().eq("id",id).select("qty"));
//同步修改未出库单据 //同步修改未出库单据
if (existDtlData.getQty().compareTo(BigDecimal.ZERO) > 0||f.getPlan_qty().compareTo(f.getAssign_qty()) > 0) { if (existDtlData.getQty().compareTo(BigDecimal.ZERO) > 0||f.getPlan_qty().compareTo(f.getAssign_qty()) > 0)
{
formDataService.update(new LambdaUpdateWrapper<PmFormData>() formDataService.update(new LambdaUpdateWrapper<PmFormData>()
.set(PmFormData::getMaterial_id, f.getMaterial_id()) .set(PmFormData::getMaterial_id, f.getMaterial_id())
.set(PmFormData::getQty, f.getQty()) .set(PmFormData::getQty, f.getQty())
.set(PmFormData::getAssign_qty, f.getAssign_qty()) //todo 确认分配数量是多少
.set(PmFormData::getAssign_qty, f.getQty())
.set(PmFormData::getUnit_id, f.getUnit_id()) .set(PmFormData::getUnit_id, f.getUnit_id())
.set(PmFormData::getForm_data, JSON.toJSONString(f.getForm_data())) .set(PmFormData::getForm_data, JSON.toJSONString(f.getForm_data()))
.set(PmFormData::getPlan_qty, f.getPlan_qty()) .set(PmFormData::getPlan_qty, f.getPlan_qty())

4
wms_pro/hd/nladmin-system/src/main/resources/config/application-dev.yml
View File

@@ -7,8 +7,8 @@ spring:
druid: druid:
db-type: com.alibaba.druid.pool.DruidDataSource db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://${DB_HOST:192.168.8.218}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false # url: jdbc:mysql://${DB_HOST:192.168.8.218}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimxezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
url: jdbc:mysql://${DB_HOST:192.168.18.218}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:wms_hs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
username: ${DB_USER:root} username: ${DB_USER:root}
password: ${DB_PWD:123456} password: ${DB_PWD:123456}

2
wms_pro/hd/nladmin-system/src/main/resources/config/application.yml
View File

@@ -6,7 +6,7 @@ spring:
freemarker: freemarker:
check-template-location: false check-template-location: false
profiles: profiles:
active: prod active: dev
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
data: data: