物料变更增加是否组织扩展字段控制；BPM推送物料信息到SAP后，只接收SAP返回的消息

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

@@ -241,7 +241,10 @@ function saveForm(status) {
         url: web_app.name + '/sapNonProdApplyNext/saveSapNonProdApplyDept.ajax',
         //param: extendedData,
         success: function (data) {
-            $("#applyDeptId").val(data.applyDeptId);
+            //$("#applyDeptId").val(data.applyDeptId);
+            if (status == 1){
+                $("#matnr").val(data.matnr);
+            }
              if (data.result=="")
              {
                Public.successTip("保存成功！");
@@ -805,18 +808,18 @@ function bindEvent_mrp(mtart){
 
     //采购收货默认库存地
     if (mtart == "ZYCL" || mtart == "ZMYP" || mtart == "ZFBL"){
-        $("#lgpro").val("Q000");
-        $("#lgproName").val("质检库/不良品库");
+        $("#lgfsb").val("Q000");
+        $("#lgfsbName").val("质检库/不良品库");
     }else if (mtart == "ZBPJ" || mtart == "ZBZP" || mtart == "ZCOM"
         || mtart == "ZECC" || mtart == "ZGMB" || mtart == "ZKGL" || mtart == "ZSHB"){
-        $("#lgpro").val($("#lgort").val());
-        $("#lgproName").val($("#lgortName").val());
+        $("#lgfsb").val($("#lgort").val());
+        $("#lgfsbName").val($("#lgortName").val());
     }
 
     //生产发货默认库存地
     if (mtart != "ZSRV" && mtart != "ZXHP" && mtart != "ZXNJ"){
-        $("#lgfsb").val($("#lgort").val());
-        $("#lgfsbName").val($("#lgortName").val());
+        $("#lgpro").val($("#lgort").val());
+        $("#lgproName").val($("#lgortName").val());
     }
 }
 

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyDetail.jsp

@@ -58,7 +58,7 @@
     <x:title title="维护物品总体内容" name="group"/>
     <div class="hg-form-cols">
         <div class="hg-form-row">
-            <x:inputC name="genericName" label="通用品名" labelCol="1" fieldCol="5"/>
+            <x:inputC name="genericName" label="通用品名" required="true" labelCol="1" fieldCol="5"/>
             <x:inputC name="matnr" label="物料编号" labelCol="1" fieldCol="2"/>
           <c:if test="${kind=='product'}">
             <x:inputC name="applicableStandard" label="适用标准(国标)" labelCol="1" fieldCol="2"/>
@@ -85,6 +85,10 @@
                <x:checkboxListC name="businessUsage" label="业务用途" list="businessUsageUnSeledList" labelCol="1"
                          fieldCol="8"/>
         </div>
+          <div class="hg-form-row">
+              <p style="color: red;font-weight: bold">扩展物料到其他工厂请勾选是</p>
+              <x:selectC name="isExtendOrg" label="是否扩展组织" labelCol="1" fieldCol="2" dictionary="yesorno"/>
+          </div>
      </c:if>
         <c:if test="${applyType==1}">
             <div class="hg-form-row">
@@ -99,9 +103,11 @@
                              fieldCol="8"/>
         </div>
       </c:if>
+        <div class="hg-form-row">
         <div style="padding-top: 15px;">
             <x:fileList bizCode="nonProApplyInfo" bizId="attbizId" id="nonProApplyInfoList" title="上传附件" />
         </div>
+        </div>
     </div>
 
 

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

@@ -292,7 +292,7 @@
                         <x:selectC name="diskz" label="库存地MRP标识" labelCol="1" fieldCol="2" dictionary="diskz"/>
                         <x:inputC name="lgproName" label="默认生产库存地" labelCol="1" fieldCol="2" wrapper="select"/>
                         <x:hidden name="lgpro"/>
-                        <x:inputC name="lgfsbName" label="默认采购收货库存地" labelCol="1" fieldCol="2" wrapper="select"/>
+                        <x:inputC name="lgfsbName" label="外部采购存储地点" labelCol="1" fieldCol="2" wrapper="select"/>
                         <x:hidden name="lgfsb"/>
                     </div>
                 </div>

topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataDetail.jsp

@@ -64,7 +64,7 @@
             <x:inputC name="strSuppl3" label="街道4" labelCol="1" fieldCol="2"/>--%>
             <x:inputC name="land1Name" label="国家" labelCol="1" fieldCol="2" required="true" wrapper="select"/>
             <x:hidden name="land1"/>
-            <x:inputC name="regionName" label="地区" labelCol="1" fieldCol="2" required="false" wrapper="select"/>
+            <x:inputC name="regionName" label="地区" labelCol="1" fieldCol="2" required="true" wrapper="select"/>
             <x:hidden name="region"/>
             <x:inputC name="city1" label="城市" labelCol="1" fieldCol="2" required="true" />
 

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

@@ -127,45 +127,50 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
             if ("modify".equals(nonProdApplyBaseInfo.getMaintenanceType())) {
                 ClassHelper.copyProperties(sapNonProdApplyDept, newSapNonProdApplyDept);
             } else { //扩展的  设置默认基本字段
-                newSapNonProdApplyDept.setMatnr(sapNonProdApplyDept.getMatnr());
-                newSapNonProdApplyDept.setMatkl(sapNonProdApplyDept.getMatkl());
-                newSapNonProdApplyDept.setMatklName(sapNonProdApplyDept.getMatklName());
-                newSapNonProdApplyDept.setGroes(sapNonProdApplyDept.getGroes());
-                newSapNonProdApplyDept.setMtart(sapNonProdApplyDept.getMtart());
-                newSapNonProdApplyDept.setSpart(sapNonProdApplyDept.getSpart());
-                newSapNonProdApplyDept.setSpartName(sapNonProdApplyDept.getSpartName());
-                newSapNonProdApplyDept.setMtposMara(sapNonProdApplyDept.getMtposMara());
-                newSapNonProdApplyDept.setXchpf(sapNonProdApplyDept.getXchpf());
-                newSapNonProdApplyDept.setMaktx(sapNonProdApplyDept.getMaktx());
-                newSapNonProdApplyDept.setMaktxEn(sapNonProdApplyDept.getMaktxEn());
-                newSapNonProdApplyDept.setMeins(sapNonProdApplyDept.getMeins());
-                newSapNonProdApplyDept.setMeinsName(sapNonProdApplyDept.getMeinsName());
-                newSapNonProdApplyDept.setRaube(sapNonProdApplyDept.getRaube());
-                newSapNonProdApplyDept.setBrgew(sapNonProdApplyDept.getBrgew());
-                newSapNonProdApplyDept.setGewei(sapNonProdApplyDept.getGewei());
-                newSapNonProdApplyDept.setVolum(sapNonProdApplyDept.getVolum());
-                newSapNonProdApplyDept.setVoleh(sapNonProdApplyDept.getVoleh());
-                newSapNonProdApplyDept.setIprkz(sapNonProdApplyDept.getIprkz());
-                newSapNonProdApplyDept.setMhdhb(sapNonProdApplyDept.getMhdhb());
-                newSapNonProdApplyDept.setMhdrz(sapNonProdApplyDept.getMhdrz());
-                newSapNonProdApplyDept.setNormt(sapNonProdApplyDept.getNormt());
-                newSapNonProdApplyDept.setLength(sapNonProdApplyDept.getLength());
-                newSapNonProdApplyDept.setWidthCm(sapNonProdApplyDept.getWidthCm());
-                newSapNonProdApplyDept.setThickness(sapNonProdApplyDept.getThickness());
-                newSapNonProdApplyDept.setWeight(sapNonProdApplyDept.getWeight());
-                newSapNonProdApplyDept.setSingleThickness(sapNonProdApplyDept.getSingleThickness());
-                newSapNonProdApplyDept.setKlart(sapNonProdApplyDept.getKlart());
-                newSapNonProdApplyDept.setClassify(sapNonProdApplyDept.getClassify());
-                newSapNonProdApplyDept.setMaktxRemEn(sapNonProdApplyDept.getMaktxRemEn());
-                newSapNonProdApplyDept.setMaktxRemZh(sapNonProdApplyDept.getMaktxRemZh());
-                newSapNonProdApplyDept.setWerks(sapNonProdApplyDept.getWerks());
-                newSapNonProdApplyDept.setWerksName(sapNonProdApplyDept.getWerksName());
-                newSapNonProdApplyDept.setLgort(sapNonProdApplyDept.getLgort());
-                newSapNonProdApplyDept.setLgortName(sapNonProdApplyDept.getLgortName());
-                newSapNonProdApplyDept.setLgtyp(sapNonProdApplyDept.getLgtyp());
-                newSapNonProdApplyDept.setLgtypName(sapNonProdApplyDept.getLgtypName());
-                newSapNonProdApplyDept.setMtvfp(sapNonProdApplyDept.getMtvfp());
-                newSapNonProdApplyDept.setLvorm(sapNonProdApplyDept.getLvorm());
+                if ("1".equals(nonProdApplyBaseInfo.getIsExtendOrg())){
+                    ClassHelper.copyProperties(sapNonProdApplyDept, newSapNonProdApplyDept);
+                }else {
+                    newSapNonProdApplyDept.setMatnr(sapNonProdApplyDept.getMatnr());
+                    newSapNonProdApplyDept.setMatkl(sapNonProdApplyDept.getMatkl());
+                    newSapNonProdApplyDept.setMatklName(sapNonProdApplyDept.getMatklName());
+                    newSapNonProdApplyDept.setGroes(sapNonProdApplyDept.getGroes());
+                    newSapNonProdApplyDept.setMtart(sapNonProdApplyDept.getMtart());
+                    newSapNonProdApplyDept.setSpart(sapNonProdApplyDept.getSpart());
+                    newSapNonProdApplyDept.setSpartName(sapNonProdApplyDept.getSpartName());
+                    newSapNonProdApplyDept.setMtposMara(sapNonProdApplyDept.getMtposMara());
+                    newSapNonProdApplyDept.setXchpf(sapNonProdApplyDept.getXchpf());
+                    newSapNonProdApplyDept.setMaktx(sapNonProdApplyDept.getMaktx());
+                    newSapNonProdApplyDept.setMaktxEn(sapNonProdApplyDept.getMaktxEn());
+                    newSapNonProdApplyDept.setMeins(sapNonProdApplyDept.getMeins());
+                    newSapNonProdApplyDept.setMeinsName(sapNonProdApplyDept.getMeinsName());
+                    newSapNonProdApplyDept.setRaube(sapNonProdApplyDept.getRaube());
+                    newSapNonProdApplyDept.setBrgew(sapNonProdApplyDept.getBrgew());
+                    newSapNonProdApplyDept.setGewei(sapNonProdApplyDept.getGewei());
+                    newSapNonProdApplyDept.setVolum(sapNonProdApplyDept.getVolum());
+                    newSapNonProdApplyDept.setVoleh(sapNonProdApplyDept.getVoleh());
+                    newSapNonProdApplyDept.setIprkz(sapNonProdApplyDept.getIprkz());
+                    newSapNonProdApplyDept.setMhdhb(sapNonProdApplyDept.getMhdhb());
+                    newSapNonProdApplyDept.setMhdrz(sapNonProdApplyDept.getMhdrz());
+                    newSapNonProdApplyDept.setNormt(sapNonProdApplyDept.getNormt());
+                    newSapNonProdApplyDept.setLength(sapNonProdApplyDept.getLength());
+                    newSapNonProdApplyDept.setWidthCm(sapNonProdApplyDept.getWidthCm());
+                    newSapNonProdApplyDept.setThickness(sapNonProdApplyDept.getThickness());
+                    newSapNonProdApplyDept.setWeight(sapNonProdApplyDept.getWeight());
+                    newSapNonProdApplyDept.setSingleThickness(sapNonProdApplyDept.getSingleThickness());
+                    newSapNonProdApplyDept.setKlart(sapNonProdApplyDept.getKlart());
+                    newSapNonProdApplyDept.setClassify(sapNonProdApplyDept.getClassify());
+                    newSapNonProdApplyDept.setMaktxRemEn(sapNonProdApplyDept.getMaktxRemEn());
+                    newSapNonProdApplyDept.setMaktxRemZh(sapNonProdApplyDept.getMaktxRemZh());
+                    newSapNonProdApplyDept.setWerks(sapNonProdApplyDept.getWerks());
+                    newSapNonProdApplyDept.setWerksName(sapNonProdApplyDept.getWerksName());
+                    newSapNonProdApplyDept.setLgort(sapNonProdApplyDept.getLgort());
+                    newSapNonProdApplyDept.setLgortName(sapNonProdApplyDept.getLgortName());
+                    newSapNonProdApplyDept.setLgtyp(sapNonProdApplyDept.getLgtyp());
+                    newSapNonProdApplyDept.setLgtypName(sapNonProdApplyDept.getLgtypName());
+                    newSapNonProdApplyDept.setMtvfp(sapNonProdApplyDept.getMtvfp());
+                    newSapNonProdApplyDept.setLvorm(sapNonProdApplyDept.getLvorm());
+                }
+
 
 //                newSapNonProdApplyDept.setMagrv(sapNonProdApplyDept.getMagrv());
 //                newSapNonProdApplyDept.setVkorg(sapNonProdApplyDept.getVkorg());
@@ -329,7 +334,7 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
         //查询 单据日期
         String fillinDateStr = DateUtil.getDateFormat("yyyy-MM-dd HH:mm:ss", baseInfo.getFillinDate());
         //设置标题
-        String title = "非产品/半成品类物料主数据";
+        String title = "物料主数据";
         String maintenanceType = baseInfo.getMaintenanceType();
         if ("new".equals(maintenanceType)){
             title = title + "新增";
@@ -338,7 +343,7 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
         } else if ("extend".equals(maintenanceType)) {
             title = title + "扩展";
         }
-        return String.format("%s-%s(%s)", title, baseInfo.getBillCode(), fillinDateStr);
+        return String.format("%s-%s-%s(%s)", title, baseInfo.getBillCode(), baseInfo.getGenericName(),fillinDateStr);
     }
 
     @Override

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

@@ -175,5 +175,11 @@ public class NonProdApplyBaseInfo extends FlowBillAbstractEntity {
     @Transient
     private String businessUsageSeled;
 
+    /**
+     * 1是 ，0 否
+     */
+    @Column(name = "is_extend_org")
+    private String isExtendOrg;
+
 
 }
\ No newline at end of file