工序外协根据产品编码，工序编码和数量匹配工序报价

huigou-xt/src/main/resources/config/spring/spring-redis.xml

@@ -20,7 +20,12 @@
         <property name="port" value="${shiro.port}"/>
         <property name="usePool" value="true"/>
         <property name="poolConfig" ref="jedisPoolConfig"/>
-        <property name="database" value="0"/><!--指定数据库-->
+        <!--开发测试指定数据库-->
+        <property name="database" value="0"/>
+        <!--310集成指定数据库-->
+        <!--<property name="database" value="1"/>-->
+        <!--320指定数据库-->
+        <!--<property name="database" value="2"/>-->
     </bean>
 
     <bean id="redisTemplate" class="org.springframework.data.redis.core.RedisTemplate">

huigou-xt/src/main/webapp/system/opm/organization/Org.js

@@ -138,7 +138,7 @@ $(function () {
                 { display: "编码", name: "code", width: 100, minWidth: 60, type: "string", align: "left" },
                 { display: "名称", name: "name", width: 100, minWidth: 60, type: "string", align: "left" },
                 { display: "证件号码", name: "certificateNo", width: 160, minWidth: 60, type: "string", align: "left" },
-                { display: "全称", name: "longName", width: 100, minWidth: 60, type: "string", align: "left" },
+                //{ display: "全称", name: "longName", width: 100, minWidth: 60, type: "string", align: "left" },
                 { display: "排序号", name: "sequence", width: 60, minWidth: 60, type: "string", align: "left",
                   render: function(item) {
                 	  				var id = item.id.replace(/\@/g,"_");

topsun-xt/src/main/webapp/biz/topsun/sap/processOutsource/processOutsourceDetail.js

@@ -85,6 +85,20 @@ function loadOrderItemGrid() {
         checkbox: true,
         fixedCellHeight: true,
         selectRowButtonOnly: true,
+        onAfterEdit:function (item) {
+            if(item.column.name == "menge"){
+                Public.ajax(web_app.name + "/processQuotedPrice/findPriceByProductAndProcess.ajax?" +
+                    "productCode="+item.record.productCode+
+                    "&outProcess="+item.record.wempf+
+                    "&number="+item.record.menge,
+                    {
+                    },function (data){
+                        orderItemGridManager.updateRow(item.record,{
+                            kbetr:data
+                        })
+                })
+            }
+        }
     });
     UICtrl.setSearchAreaToggle(orderItemGridManager);
 }

topsun/src/main/java/com/huigou/topsun/syncOrg/controller/SyncOrgController.java

@@ -29,6 +29,10 @@ public class SyncOrgController extends CommonController {
     @Autowired
     private OrgSyncApplication orgSyncApplication;
 
+    /**
+     * 同步人员到EP
+     * @return
+     */
     @SkipAuth
     @RequestMapping( value = "/syncOrgInfo")
     @ResponseBody