diff --git a/buildpackage/pom.xml b/buildpackage/pom.xml
index 96ec370c..2956d6b1 100644
--- a/buildpackage/pom.xml
+++ b/buildpackage/pom.xml
@@ -105,6 +105,12 @@
lets
+
+ letsprod
+
+ letsprod
+
+
kangarooDataCenterV3
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/GoodsAutoAllotPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/GoodsAutoAllotPluginInitializer.java
index 2afd0da3..7fefc376 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/GoodsAutoAllotPluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/GoodsAutoAllotPluginInitializer.java
@@ -86,6 +86,38 @@ public class GoodsAutoAllotPluginInitializer extends PluginBaseEntity {
@Override
public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception {
+ try {
+ logger.info("调用:" + getPluginName() + "-插件");
+ String prod = "prod";
+ String param = String.valueOf(requestJson.get("param"));
+ if (requestJson != null && ProfilesActiveConstant.TYPE_DATE.equals(requestJson.get("type"))) {
+ //按日期
+ if (param != null && !"".equals(param)) {
+ String[] split = param.split("/");
+ if (!(split.length == 2)) {
+ Assert.state(false, "时间格式传递不正确");
+ }
+ Assert.notNull(split[0], "开始时间不能为空");
+ Assert.notNull(split[1], "结束时间不能为空");
+ start(split[0], split[1]);
+ }
+ } else if (requestJson != null && ProfilesActiveConstant.TYPE_VBILLCODE.equals(requestJson.get("type"))) {
+ //按单号
+ if (param != null && !"".equals(param)) {
+ start(param);
+ }
+ } else if (ProfilesActiveConstant.TYPE_DETAIL_ERROR.equals(requestJson.get("type"))) {
+ String integrationTaskLivingDetails = (String) requestJson.get("integration_task_living_details_id");
+ IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = saveOrUpdateBusinessLogUtil.queryIntegrationTaskLivingDetailsEntity(integrationTaskLivingDetails);
+ start(integrationTaskLivingDetailsEntity.getRootAppPk());
+ } else if (ProfilesActiveConstant.LETS_PROFILES_ACTIVE.equals(prod)) {
+ //默认
+ start();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ logger.error("executeBusiness方法抛出异常", e);
+ }
return null;
}
@@ -196,7 +228,7 @@ public class GoodsAutoAllotPluginInitializer extends PluginBaseEntity {
boolean isExis = true;
IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity();
integrationTaskLivingDetailsEntity.setRootAppPk(rootAppPk);
- integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_Y);
+ integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_Y_H);
integrationTaskLivingDetailsEntity.setPluginId(getPluginId());
List integrationTaskLivingDetailsEntities = iIntegrationTaskLivingDetailsDao.query(integrationTaskLivingDetailsEntity);
if (integrationTaskLivingDetailsEntities == null || integrationTaskLivingDetailsEntities.size() == 0) {
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUPluginInitializer.java
index c437a0df..c7ad02d1 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUPluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUPluginInitializer.java
@@ -249,7 +249,7 @@ public class SKUPluginInitializer extends PluginBaseEntity {
boolean isExis = true;
IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity();
integrationTaskLivingDetailsEntity.setRootAppPk(rootAppPk);
- integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_Y);
+ integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_Y_H);
integrationTaskLivingDetailsEntity.setPluginId(getPluginId());
List integrationTaskLivingDetailsEntities = iIntegrationTaskLivingDetailsDao.query(integrationTaskLivingDetailsEntity);
if (integrationTaskLivingDetailsEntities == null || integrationTaskLivingDetailsEntities.size() == 0) {
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUSealPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUSealPluginInitializer.java
index fa81f0b9..920c317e 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUSealPluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUSealPluginInitializer.java
@@ -150,10 +150,14 @@ public class SKUSealPluginInitializer extends PluginBaseEntity {
return;
}
//找到最后修改时间的,进行过滤
+ List sortSkuList = groupAndSort(ofsskuList);
+ List filterSkus = filterData(sortSkuList);
- //查询物料的所有公司,根据物料分组
+ //查到每个code下所有的公司并且分组,得到一个map
+ Map> skuMap = getSkuMap(filterSkus);
- //推送
+ //循环map实现
+ sealImplement(skuMap);
} catch (Exception e) {
@@ -207,6 +211,18 @@ public class SKUSealPluginInitializer extends PluginBaseEntity {
if (ofsskuList.size() == 0) {
Assert.state(false, "根据期间:{} - {} 内,未查询到OFS系统中SKU主档信息,请检查。");
}
+
+ //找到最后修改时间的,进行过滤
+ List sortSkuList = groupAndSort(ofsskuList);
+ List filterSkus = filterData(sortSkuList);
+
+ //查到每个code下所有的公司并且分组,得到一个map
+ Map> skuMap = getSkuMap(filterSkus);
+
+ //循环map实现
+ sealImplement(skuMap);
+
+
// //分组排序,
// List sortSkuList = groupAndSort(ofsskuList);
//