diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/SyncReceiptProcessHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/SyncReceiptProcessHandler.java index 88c54e6e..ab20b91c 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/SyncReceiptProcessHandler.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/SyncReceiptProcessHandler.java @@ -131,9 +131,8 @@ public class SyncReceiptProcessHandler implements ClassProcess { throw new BadRequestException("该生产订单未找到对应生产汇报单"); } JSONArray optRptEntry = jsonArray.getJSONObject(0).getJSONArray("OptRptEntry"); + fEntity.put("FSrcEntryId", optRptEntry.getJSONObject(0).getString("Id")); Map linkedMap = new LinkedHashMap<>(); - //移除重构源单Id - fEntity.remove("FSrcEntryId"); for (String key : fEntity.keySet()) { 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_FSId", optRptEntry.getJSONObject(0).getString("Id")); fEntityLink.put("FEntity_Link_FSTableName", "T_SFC_OPTRPTENTRY"); - fEntityLink.put("FEntity_Link_FBasePrdRealQtyOld", fEntity.getString("FMustQty")); - fEntityLink.put("FEntity_Link_FBasePrdRealQty", fEntity.getString("FMustQty")); + fEntityLink.put("FEntity_Link_FBasePrdRealQtyOld", fEntity.getString("FRealQty")); + fEntityLink.put("FEntity_Link_FBasePrdRealQty", fEntity.getString("FRealQty")); fEntityLinkArray.add(fEntityLink); tempMap.put("FEntity_Link", fEntityLinkArray); fEntity.clear(); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java index f7e0f4e7..8aef5c8f 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java @@ -133,7 +133,7 @@ public class SyncErpBillsScheduleService { // 获取当前日期 String today = new SimpleDateFormat("yyyy-MM-dd").format(new Date()); 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 filterString; if (StringUtils.isNotBlank(billCode)) { @@ -188,7 +188,7 @@ public class SyncErpBillsScheduleService { // 获取当前日期 String timeEnd = new SimpleDateFormat("yyyy-MM-dd").format(new Date()); 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()); if (StringUtils.isNotBlank(start) && StringUtils.isNotBlank(end)) { timeStart = start; @@ -302,11 +302,13 @@ public class SyncErpBillsScheduleService { if (StringUtils.isBlank(f.getCode())) { PmFormData existDtlData = formDataService.getOne(new QueryWrapper().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() .set(PmFormData::getMaterial_id, f.getMaterial_id()) .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::getForm_data, JSON.toJSONString(f.getForm_data())) .set(PmFormData::getPlan_qty, f.getPlan_qty()) diff --git a/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev.yml b/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev.yml index 3fe27ef1..28c20deb 100644 --- a/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev.yml +++ b/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev.yml @@ -7,8 +7,8 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource 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.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: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: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} password: ${DB_PWD:123456} diff --git a/wms_pro/hd/nladmin-system/src/main/resources/config/application.yml b/wms_pro/hd/nladmin-system/src/main/resources/config/application.yml index ba6a483b..e96ef885 100644 --- a/wms_pro/hd/nladmin-system/src/main/resources/config/application.yml +++ b/wms_pro/hd/nladmin-system/src/main/resources/config/application.yml @@ -6,7 +6,7 @@ spring: freemarker: check-template-location: false profiles: - active: prod + active: dev jackson: time-zone: GMT+8 data: