物料主数据调整待办标题

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyApplicationImpl.java

@@ -45,6 +45,7 @@ import lombok.SneakyThrows;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.DelegateTask;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -226,7 +227,7 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
                  //publishHyzyMessage(nonProdApplyBaseInfo);
                 Map backMap=new HashMap();
                 backMap.put("TYPE","C");
-                backMap.put("title","");
+                backMap.put("title",nonProdApplyBaseInfo.getBillCode());
                 nonProdApplyDeptApplication.saveBsnMessageData(nonProdApplyBaseInfo,backMap);
             }
        // }
@@ -598,6 +599,9 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
        BsnMessageSponsor bsnMessageSponsor = new BsnMessageSponsor();
        bsnMessageSponsor.setTaskSponsor(operator.getLoginUser().getId());
        String genericName=nonProdApplyBaseInfo.getGenericName()!=null?nonProdApplyBaseInfo.getGenericName():"";
+       if (StringUtils.isBlank(genericName)) {
+           genericName=sapNonProdApplyDept.getMaktx()!=null?sapNonProdApplyDept.getMaktx():"";
+       }
        bsnMessageSponsor.setTitle(genericName);//通用品名
        bsnMessageSponsor.setExecutorUrl("sapNonProdApplyNext/forwardNonProdApplyNext.do?prod=1&isReadOnly=false");
        bsnMessageSponsor.setBusinessId(sapNonProdApplyDept.getApplyDeptId());

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java

@@ -24,7 +24,7 @@ import com.huigou.uasp.bmp.operator.OperatorApplication;
 import com.huigou.util.ClassHelper;
 import com.huigou.util.SDO;
 import com.huigou.util.StringUtil;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -182,6 +182,9 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
             } catch (JsonProcessingException e) {
                 throw new RuntimeException("JSON转换失败：" + e);
             }
+           if (StringUtils.isBlank(genericName)) {
+                genericName=nonProdApplyDept.getMaktx()!=null?nonProdApplyDept.getMaktx():"";
+            }
             saveDeptStaff(deptStaffList, nonProdApplyDept.getApplyDeptId(),genericName);
         }
         //不是分发的
@@ -494,8 +497,12 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
             messageExecute.setBusinessCode(map.get("positionCode").toString()); //HYZY
             messageExecute.setActive(ActiveStatus.UNFINISHED.getValue());
             messageExecute.setUpdateDate(new Date());
-            String sign="-.";
+             String sign="-.";
              String title= backMap.get("title")!=null?backMap.get("title").toString():"";
+             String genericName=baseInfo.getGenericName();
+            if (StringUtils.isBlank(baseInfo.getGenericName())){
+                genericName=title;
+            }
             if ("S".equals(backMap.get("TYPE").toString())) {
                 messageExecute.setTaskDescribe(title+sign + backMap.get("MESSAGE").toString());
             } else if ("E".equals(backMap.get("TYPE").toString())) {
@@ -508,9 +515,15 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
                 if (baseInfo.getMaintenanceType().equals("extend")) {
                     mess = sign+"物料扩展(";
                 }
-                messageExecute.setTaskDescribe(baseInfo.getGenericName() + mess + title + ")");
+                if (genericName.equals(title)){
+                   title="";
+                }
+                messageExecute.setTaskDescribe(genericName+ mess + title + ")");
             } else if ("D".equals(backMap.get("TYPE").toString())) {  // 推送待分发的待办信息
-                messageExecute.setTaskDescribe(baseInfo.getGenericName() +sign+ "待分发(" + title+ ")");
+                if (genericName.equals(title)){
+                    title="";
+                }
+                messageExecute.setTaskDescribe(genericName +sign+ "待分发(" + title+ ")");
             }
             bsnMessageApplication.saveBsnMessageSponsor(bsnMessageSponsor);
             messageExecute.setMessageSponsorId(bsnMessageSponsor.getId());