物料主数据修改

topsun-xt/src/main/webapp/biz/topsun/sap/dull/sapDullDetail.js

@@ -14,7 +14,7 @@ function bindEvent(){
     $('#werksName').searchbox({
         type: "system", name: "dictionary",
         getParam: function (item) {
-            return {fieldName: "werks"}
+            return {fieldName: "WERKS"}
         },
         onChange: function (value, data) {
             $('#werks').val(data.WERKS);
@@ -22,9 +22,12 @@ function bindEvent(){
         }
     });
     $('#matnrName').searchbox({
-        type: "system", name: "dictionary",
+        type: "system", name: "sapMaterialSelect",
         getParam: function (item) {
-            return {fieldName: "sapMaterialSelect"}
+            return {
+              ///  fieldName: "sapMaterialSelect",
+                filterValue: $('#werks').val()
+            }
         },
         onChange: function (value, data) {
             $('#matnr').val(data.matnr);

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.js

@@ -102,7 +102,15 @@ function loadNonProdApplyListGrid() {
             {display: "物品属性", name: "itemAttributesTextView", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "业务用途", name: "businessUsageTextView", width: 300, minWidth: 60, type: "string", align: "left"},
             {display: "文本说明", name: "textDescription", width: 140, minWidth: 60, type: "string", align: "left"},
-
+            {display: "是否分发", name: "distribute", width: 80, minWidth: 60, type: "string", align: "left",
+                render:function(item){
+                    var result = "未分发";
+                    if (item.distribute === "1"){
+                        result="已分发";
+                    }
+                    return result;
+                }
+            },
         ],
         dataAction: "server",
         url: web_app.name + '/sapNonProdApply/slicedNonProdApplyList.ajax',

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js

@@ -29,8 +29,9 @@ function initializate() {
                 $("#showChart").remove();
             }
             break;
-        case '1'://完成/审核
+        case '1'://已分发
             // $("#auditForm").show();
+            $("#buttonBox").remove();
             break;
         case '2'://保存未分发
             $("#buttonBox").show();
@@ -119,7 +120,7 @@ function loadGrid() {
     gridManager = UICtrl.grid("#businessPersonnelListGrid", {
         columns: [
             {display: "部门", name: "deptName", width: 200, minWidth: 60, type: "string", align: "left"},
-            {  display: "部门人员", name: "userName", width: 200, minWidth: 60, type: "string", align: "left",
+            {  display: "部门人员", name: "userName", width: 280, minWidth: 60, type: "string", align: "left",
                 editor: {
                     type: 'tree',
                     required: true,
@@ -134,6 +135,15 @@ function loadGrid() {
             },
             {  display: "人员Id", name: "userCode", width: 260, minWidth: 60, type: "string", align: "left",hide: true
             },
+            {  display: "是否处理", name: "active", width: 160, minWidth: 60, type: "string", align: "left",disable: "true"
+                ,render:function(item){
+                    var result = "否";
+                    if (item.active === "1"){
+                        result="是";
+                    }
+                    return result;
+                }
+            },
         ],
         dataAction: "server",
         url: web_app.name + '/sapNonProdApplyNext/slicedDeptList.ajax',
@@ -219,7 +229,7 @@ function distributeForm() {
     let extendedData = getExtendedData();
     if (!extendedData) return false;
     $('#submitForm').ajaxSubmit({
-        url: web_app.name + '/sapNonProdApplyNext/distributeSapNonProdApplyDept.ajax',
+        url: web_app.name + '/sapNonProdApplyNext/distributeSapNonProdApplyDept.ajax?distribute=1',
         param: extendedData,
         success: function (data) {
             Public.successTip("分发成功！");

topsun-xt/src/main/webapp/biz/topsun/sap/transfers/sapStockTransfersDetail.js

@@ -16,7 +16,7 @@ function bindEvent(){
     $('#lifnrName').searchbox({
         type: "system", name: "dictionary",
         getParam: function (item) {
-            return {fieldName: "lifnr"}
+            return {fieldName: "WERKS"}
         },
         onChange: function (value, data) {
             $('#lifnr').val(data.WERKS);
@@ -49,7 +49,7 @@ function bindEvent(){
     $('#burksName').searchbox({
         type: "system", name: "dictionary",
         getParam: function (item) {
-            return {fieldName: "BURKS"}
+            return {fieldName: "BUKRS"}
         },
         onChange: function (value, data) {
             $('#burks').val(data.BURKS);

topsun/src/main/java/com/huigou/topsun/base/bsnMessage/appliction/impl/BsnMessageApplicationImpl.java

@@ -212,7 +212,12 @@ public class BsnMessageApplicationImpl extends BaseApplication implements BsnMes
 
     public void deleteBsnMessageSponsor(BsnMessageSponsor entity) {
         if (isNotEmpty(entity.getExecutes())) {
-            messageExecuteRepository.delete(entity.getExecutes());
+            List<BsnMessageExecute> list=entity.getExecutes();
+            for (BsnMessageExecute bsnMessageExecute:list) {
+                if (bsnMessageExecute!=null){
+                    messageExecuteRepository.delete(bsnMessageExecute);
+                }
+            }
         }
         messageSponsorRepository.delete(entity);
     }

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

@@ -42,8 +42,12 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
         Integer active=sdo.getInteger("active");
         String meId=sdo.getString("meId");
 
+
         NonProdApplyBaseInfo nonProdApplyBaseInfo=nonProdApplyBaseInfoRepository.findOne(sdo.getString("id"));
         nonProdApplyBaseInfo.setBusinessUsage(sdo.getString("businessUsage"));
+        if (StringUtil.isNotBlank(sdo.getString("distribute"))){ //是否已分发
+            nonProdApplyBaseInfo.setDistribute(1);
+        }
         nonProdApplyBaseInfoRepository.save(nonProdApplyBaseInfo);
 
         NonProdApplyDeptVo deptVo=null;
@@ -110,7 +114,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
             }
             saveDeptStaff(deptStaffList, nonProdApplyDept.getApplyDeptId(),genericName);
         }
-        if (active == 1){//各部门提交后，隐藏消息
+        if (active!=null&&active == 1){//各部门提交后，隐藏消息
             bsnMessageApplication.submitTask(meId);
         }
         map.put("applyDeptId",nonProdApplyDept.getApplyDeptId());

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

@@ -114,6 +114,9 @@ public class NonProdApplyNextController extends CommonController {
         }
         if (nonProdApplyDept != null) {
             getBaseInfoAttrs(nonProdApplyBaseInfo, nonProdApplyDept);
+            if (nonProdApplyBaseInfo.getDistribute()!=null&&nonProdApplyBaseInfo.getDistribute()==1){
+                this.putAttribute("active",1);
+            }
             return forward("nonProdApplyNext", nonProdApplyDept);
         } else {
             this.putAttribute("active",0);
@@ -150,11 +153,13 @@ public class NonProdApplyNextController extends CommonController {
                 String value = serviceusage.get(key);
                 resultMap.put("deptCode", key);
                 resultMap.put("deptName", value);
+
                 for (BsnMessageExecute executor : executeLists) {
                     if (key.equals(executor.getBusinessCode())) {
                         resultMap.put("userCode", executor.getTaskExecute());
                         Org org = orgApplication.loadMainOrgByPersonId(executor.getTaskExecute());
                         resultMap.put("userName", org.getName());
+                        resultMap.put("active",executor.getActive().toString());
                         break;
                     }
                 }
@@ -267,6 +272,7 @@ public void getBaseInfoAttrs(NonProdApplyBaseInfo baseInfo,SapNonProdApplyDept n
         nonProdApplyDept.setBrand(baseInfo.getBrand());
         nonProdApplyDept.setMaterialUsage(baseInfo.getMaterialUsage());
         nonProdApplyDept.setItemAttributes(baseInfo.getItemAttributes());
+         nonProdApplyDept.setDistribute(baseInfo.getDistribute());
     }
 
 //    @EasySearch(queryName = "userNameSelect")

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/NonProdApplyBaseInfo.java

@@ -120,6 +120,10 @@ public class NonProdApplyBaseInfo extends FlowBillAbstractEntity {
     @Column(name = "kind")
     private String kind;
 
+   //是否分发  1表示已分发
+    @Column(name = "distribute")
+    private Integer distribute;
+
     @Transient
     private String applyType;
 

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/SapNonProdApplyDept.java

@@ -864,6 +864,8 @@ public class SapNonProdApplyDept implements Serializable {
     private String materialUsage;
     @Transient
     private String itemAttributes;
+    @Transient
+    private Integer distribute;
 
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file