物料主数据调整和修改

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/addPurchaseInfoRecordDetail.js

@@ -16,7 +16,7 @@ function initialize(){
          disableForm("infoRecord","disable");
     } else {
          var readwriteList = UICtrl.getUIElementPermissions(UIPO.READWRITE, UIPK.DETAIL);
-        // alert("dsd=="+readwriteList.length); alert(TaskKind.isReplenishTask(taskKindId)); 打回的
+        // alert("dsd=="+readwriteList.length); alert(TaskKind.isReplenishTask(taskKindId)); //打回的
         if (($("#statusId").val() == 1 && readwriteList.length > 0&&TaskKind.isReplenishTask(taskKindId)!=true)) {
              disableForm("infoRecord", "disable");
             $.each(readwriteList, function (i, o) {

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordDetail.js

@@ -654,10 +654,10 @@ function  checkInput() {
         Public.errorTip("供应商必输！");
         return false;
     }
-    if ($("#matnr").val()==""){
+   /* if ($("#matnr").val()==""){
         Public.errorTip("物料编码必输！");
         return false;
-    }
+    }*/
     if ($("#esokz").val()==""){
         Public.errorTip("记录分类必输！");
         return false;

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/NonProdApplyDeptApplication.java

@@ -47,5 +47,5 @@ public interface NonProdApplyDeptApplication {
    //保存部门分发信息
     void saveDeptStaff(List<Map<String, String>> deptStaffList,String bussinessId,String genericName);
     //保存待办消息
-    void saveBsnMessageData(NonProdApplyBaseInfo baseInfo, SapNonProdApplyDept applyDept, Operator operator,Map<String,Object> map);
+    void saveBsnMessageData(NonProdApplyBaseInfo baseInfo,Map<String,Object> backMap);
 }
\ No newline at end of file

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

@@ -221,8 +221,10 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
             if (ObjectUtils.equals(parameter.getHandleResult(), 1)) { //同意
                 //SapNonProdApplyDept nonProdApplyDept=nonProdApplyDeptApplication.getNonProdApplyDeptByBaseInfoId(nonProdApplyBaseInfo.getSourceId());
               //  SapNonProdApplyDept newNonProdApplyDept=nonProdApplyDeptApplication.getNonProdApplyDeptByBaseInfoId(nonProdApplyBaseInfo.getId());
-                 publishHyzyMessage(nonProdApplyBaseInfo);
-
+                 //publishHyzyMessage(nonProdApplyBaseInfo);
+                Map backMap=new HashMap();
+                backMap.put("TYPE","C");
+                nonProdApplyDeptApplication.saveBsnMessageData(nonProdApplyBaseInfo,backMap);
             }
        // }
       //  if(nonProdApplyBaseInfo.getMaintenanceType().equals("modify")||
@@ -283,17 +285,22 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
         nonProdApplyBaseInfoRepository.save(nonProdApplyBaseInfo);
     }
      //发布货源专员的待办消息
-    private void publishHyzyMessage(NonProdApplyBaseInfo nonProdApplyBaseInfo){
+   // private void publishHyzyMessage(NonProdApplyBaseInfo baseInfo){
+
+   /*
         String sql="select p.id,p.code,p.name,o.dept_name,o.dept_code,o.id person_member_id,o.position_name,o.position_code from sa_opperson p " +
                 "left join  sa_oporg  o on p.CODE=o.code where  MAIN_ORG_ID in (select id from sa_oporg where  code='HYZY')";
         List<Map<String, Object>> mapList = this.sqlExecutorDao.queryToListMap(sql);
         for (Map map : mapList) {
-            String user = map.get("code").toString();
+           // String user = map.get("code").toString();
             BsnMessageSponsor bsnMessageSponsor = new BsnMessageSponsor();
             bsnMessageSponsor.setTaskSponsor(map.get("id").toString());
-            bsnMessageSponsor.setTitle(nonProdApplyBaseInfo.getGenericName());//通用品名
+            bsnMessageSponsor.setTitle(baseInfo.getGenericName());//通用品名
             bsnMessageSponsor.setExecutorUrl("sapNonProdApplyNext/forwardNonProdApplyNext.do?isReadOnly=false");
-            bsnMessageSponsor.setBusinessId(nonProdApplyBaseInfo.getId());//newNonProdApplyDept.getApplyDeptId()改为BaseInfo 的ID
+            if ("product".equals(baseInfo.getKind())) {
+                bsnMessageSponsor.setExecutorUrl("sapNonProdApplyNext/forwardNonProdApplyNext.do?prod=1&isReadOnly=false");
+            }
+            bsnMessageSponsor.setBusinessId(baseInfo.getId());//newNonProdApplyDept.getApplyDeptId()改为BaseInfo 的ID
             bsnMessageSponsor.setCreateDate(new Date());
             bsnMessageSponsor.setStatus(0);
             //List<Map<String, String>> deptStaffList=new ArrayList<>();
@@ -312,13 +319,13 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
             messageExecute.setActive(ActiveStatus.UNFINISHED.getValue());
             messageExecute.setUpdateDate(new Date());
             String mess="-.物料维护(";
-            if (nonProdApplyBaseInfo.getMaintenanceType().equals("modify")){
+            if (baseInfo.getMaintenanceType().equals("modify")){
                 mess="-.物料变更(";
             }
-            if (nonProdApplyBaseInfo.getMaintenanceType().equals("extend")){
+            if (baseInfo.getMaintenanceType().equals("extend")){
                 mess="-.物料扩展(";
             }
-            messageExecute.setTaskDescribe(nonProdApplyBaseInfo.getGenericName() + mess+ deptName + ")");
+            messageExecute.setTaskDescribe(baseInfo.getGenericName() + mess+ deptName + ")");
 
             //保存任务
             // bsnMessageApplication.keepTasks(bsnMessageSponsor);
@@ -329,9 +336,9 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
             List<BsnMessageExecute> executes = new ArrayList<>();
             executes.add(messageExecute);
             bsnMessageApplication.saveBsnMessageExecute(executes);
-        }
+        } */
 
-    }
+    //}
     /**
      * 流程撤销事件
      **/

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyNextController.java

@@ -212,7 +212,7 @@ public class NonProdApplyNextController extends CommonController {
     }
 
     /**
-     * 添加
+     * 保存 /提交
      */
     public String saveSapNonProdApplyDept() {
         SDO sdo = this.getSDO();

topsun/src/main/resources/config/topsun/base/bsnMessage.xml

@@ -5,10 +5,10 @@
 		<sql-query>
 			SELECT t.id,t.message_sponsor_id,t.task_execute,t.business_code,t.update_date,t.finished_date,t.active,
 			CASE WHEN t.active = 3 THEN CONCAT(t.task_describe, :addText) ELSE
-			case when t.business_code='HYZY' then SUBSTRING(t.task_describe,LOCATE('-.',t.task_describe)+2)
+			case when t.business_code='HYZY' then SUBSTRING(t.task_describe,LOCATE('-.',t.task_describe)+1)
 			else t.task_describe  end
 			END AS task_describe,
-			IFNULL(ad.maktx,left(t.task_describe,LOCATE('-.',t.task_describe)-2)) as title,
+			IFNULL(ad.maktx,left(t.task_describe,LOCATE('-.',t.task_describe)-1)) as title,
 			t2.executor_url,
 			t2.business_id
 			FROM bsn_message_execute t