merge清楚

applications/document/document-server/src/main/resources/mapper/CustomeraddressMapper.xml

@@ -211,102 +211,31 @@
   </select>
 
   <insert id="batchInsert" parameterType="java.util.List" >
-    <foreach collection="list" item="item" index="index" open="" close="" separator=",">
-      insert into customeraddress
-      <trim prefix="(" suffix=")" suffixOverrides=",">
-
-        <if test="item.ca_cuid != null">
-          ca_cuid,
-        </if>
-        <if test="item.ca_detno != null">
-          ca_detno,
-        </if>
-        <if test="item.ca_person != null">
-          ca_person,
-        </if>
-        <if test="item.ca_phone != null">
-          ca_phone,
-        </if>
-        <if test="item.ca_default != null">
-          ca_default,
-        </if>
-        <if test="item.companyId != null">
-          companyid,
-        </if>
-        <if test="item.updaterId != null">
-          updaterid,
-        </if>
-        <if test="item.updateTime != null">
-          updatetime,
-        </if>
-        <if test="item.ca_text1 != null">
-          ca_text1,
-        </if>
-        <if test="item.ca_text2 != null">
-          ca_text2,
-        </if>
-        <if test="item.ca_text3 != null">
-          ca_text3,
-        </if>
-        <if test="item.ca_text4 != null">
-          ca_text4,
-        </if>
-        <if test="item.ca_text5 != null">
-          ca_text5,
-        </if>
-        <if test="item.ca_address != null">
-          ca_address,
-        </if>
-      </trim>
-      <trim prefix="values (" suffix=")" suffixOverrides=",">
 
-        <if test="item.ca_cuid != null">
-          #{item.ca_cuid,jdbcType=INTEGER},
-        </if>
-        <if test="item.ca_detno != null">
-          #{item.ca_detno,jdbcType=INTEGER},
-        </if>
-        <if test="item.ca_person != null">
-          #{item.ca_person,jdbcType=VARCHAR},
-        </if>
-        <if test="item.ca_phone != null">
-          #{item.ca_phone,jdbcType=INTEGER},
-        </if>
-        <if test="item.ca_default != null">
-          #{item.ca_default,jdbcType=INTEGER},
-        </if>
-        <if test="item.companyId != null">
-          #{item.companyId,jdbcType=INTEGER},
-        </if>
-        <if test="item.updaterId != null">
-          #{item.updaterId,jdbcType=INTEGER},
-        </if>
-        <if test="item.updateTime != null">
-          #{item.updateTime,jdbcType=TIMESTAMP},
-        </if>
-        <if test="item.ca_text1 != null">
-          #{item.ca_text1,jdbcType=VARCHAR},
-        </if>
-        <if test="item.ca_text2 != null">
-          #{item.ca_text2,jdbcType=VARCHAR},
-        </if>
-        <if test="item.ca_text3 != null">
-          #{item.ca_text3,jdbcType=VARCHAR},
-        </if>
-        <if test="item.ca_text4 != null">
-          #{item.ca_text4,jdbcType=VARCHAR},
-        </if>
-        <if test="item.ca_text5 != null">
-          #{item.ca_text5,jdbcType=VARCHAR},
-        </if>
-        <if test="item.ca_address != null">
-          #{item.ca_address,jdbcType=LONGVARCHAR},
-        </if>
-      </trim>
+    insert into customeraddress
+    (ca_cuid,ca_detno,ca_person,ca_address,ca_phone,
+    ca_default,companyid,updaterid,updatetime,ca_text1,
+    ca_text2,ca_text3,ca_text4,ca_text5) VALUES
+    <foreach collection="list" item="item" index="index" open="" close="" separator=",">
+      (
+      #{item.ca_cuid,jdbcType=INTEGER},
+      #{item.ca_detno,jdbcType=INTEGER},
+      #{item.ca_person,jdbcType=VARCHAR},
+      #{item.ca_address,jdbcType=LONGVARCHAR},
+      #{item.ca_phone,jdbcType=INTEGER},
+      #{item.ca_default,jdbcType=INTEGER},
+      #{item.companyId,jdbcType=INTEGER},
+      #{item.updaterId,jdbcType=INTEGER},
+      #{item.updateTime,jdbcType=TIMESTAMP},
+      #{item.ca_text1,jdbcType=VARCHAR},
+      #{item.ca_text2,jdbcType=VARCHAR},
+      #{item.ca_text3,jdbcType=VARCHAR},
+      #{item.ca_text4,jdbcType=VARCHAR},
+      #{item.ca_text5,jdbcType=VARCHAR}
+       )
     </foreach>
   </insert>
 
-
   <update id="batchUpdate" parameterType="com.usoftchina.saas.document.entities.Customeraddress" >
     <foreach collection="list" item="item" index="index" open="" close="" separator=";">
       update customeraddress

applications/document/document-server/src/main/resources/mapper/CustomercontactMapper.xml

@@ -196,72 +196,31 @@
   </select>
 
   <insert id="batchInsert" parameterType="java.util.List" >
+    insert into customercontact (cc_cuid, cc_detno,
+    cc_name, cc_tel, cc_qq,
+    cc_email, companyid, updaterid,
+    updatetime, cc_text1, cc_text2,
+    cc_text3, cc_text4, cc_text5,cc_default
+    )
+    values
     <foreach collection="list" item="item" index="index" open="" close="" separator=",">
-      insert into customercontact
-      <trim prefix="(" suffix=")" suffixOverrides=",">
-        <if test="item.cc_cuid != null">
-          cc_cuid,
-        </if>
-        <if test="item.cc_detno != null">
-          cc_detno,
-        </if>
-        <if test="item.cc_name != null">
-          cc_name,
-        </if>
-        <if test="item.cc_tel != null">
-          cc_tel,
-        </if>
-        <if test="item.cc_qq != null">
-          cc_qq,
-        </if>
-        <if test="item.cc_email != null">
-          cc_email,
-        </if>
-        <if test="item.companyId != null">
-          companyid,
-        </if>
-        <if test="item.updaterId != null">
-          updaterid,
-        </if>
-        <if test="item.updateTime != null">
-          updatetime,
-        </if>
-        <if test="item.cc_default != null">
-          cc_default,
-        </if>
-      </trim>
-      <trim prefix="values (" suffix=")" suffixOverrides=",">
-        <if test="item.cc_cuid != null">
+      (
           #{item.cc_cuid,jdbcType=INTEGER},
-        </if>
-        <if test="item.cc_detno != null">
           #{item.cc_detno,jdbcType=INTEGER},
-        </if>
-        <if test="item.cc_name != null">
           #{item.cc_name,jdbcType=VARCHAR},
-        </if>
-        <if test="item.cc_tel != null">
           #{item.cc_tel,jdbcType=INTEGER},
-        </if>
-        <if test="item.cc_qq != null">
           #{item.cc_qq,jdbcType=VARCHAR},
-        </if>
-        <if test="item.cc_email != null">
           #{item.cc_email,jdbcType=VARCHAR},
-        </if>
-        <if test="item.companyId != null">
           #{item.companyId,jdbcType=INTEGER},
-        </if>
-        <if test="item.updaterId != null">
           #{item.updaterId,jdbcType=INTEGER},
-        </if>
-        <if test="item.updateTime != null">
           #{item.updateTime,jdbcType=TIMESTAMP},
-        </if>
-        <if test="item.cc_default != null">
-          #{item.cc_default,jdbcType=INTEGER},
-        </if>
-      </trim>
+          #{item.cc_text1,jdbcType=VARCHAR},
+          #{item.cc_text2,jdbcType=VARCHAR},
+          #{item.cc_text3,jdbcType=VARCHAR},
+          #{item.cc_text4,jdbcType=VARCHAR},
+          #{item.cc_text5,jdbcType=VARCHAR},
+          #{item.cc_default,jdbcType=INTEGER}
+      )
     </foreach>
   </insert>
 

applications/document/document-server/src/main/resources/mapper/WarehouseMapper.xml

@@ -309,10 +309,6 @@
         where wh_id = #{id}
     </update>
 
-    <select id="selectAll" resultMap="WarehouseResultMapper">
-        SELECT * FROM WAREHOUSE WHERE companyId = #{companyId}
-    </select>
-
     <select id="validateCodeWhenInsert" resultType="int">
         select count(*) from WAREHOUSE where WH_CODE = #{code} and companyId =#{companyId}
     </select>
@@ -330,7 +326,7 @@
                 and  companyid = #{companyId}
             </if>
         </where>
-        order by cu_id
+        order by wh_id
     </select>
 
 

applications/document/document-server/src/test/java/com/usoftchina/saas/document/mapper/CustomeraddressMapperTest.java

@@ -47,9 +47,17 @@ public class CustomeraddressMapperTest {
     @Test
     public void batchInsert() throws Exception {
         List<Customeraddress> list = new ArrayList<>();
-        Customeraddress customeraddress = new Customeraddress();
-        customeraddress.setCa_address("地址1");
-        list.add(customeraddress);
+        Customeraddress customeraddress1 = new Customeraddress();
+        customeraddress1.setCa_address("地址1");
+
+        Customeraddress customeraddress2 = new Customeraddress();
+        customeraddress2.setCa_address("地址2");
+
+        list.add(customeraddress1);
+        list.add(customeraddress2);
+
+
+
         customeraddressMapper.batchInsert(list);
     }
 

applications/document/document-server/src/test/java/com/usoftchina/saas/document/mapper/CustomercontactMapperTest.java

@@ -53,7 +53,14 @@ public class CustomercontactMapperTest {
         customercontact.setCc_name("zdw");
         customercontact.setCc_tel(1881);
 
+        Customercontact customercontact1 = new Customercontact();
+        customercontact1.setCc_cuid(new Long(1));
+        customercontact1.setCc_detno(1);
+        customercontact1.setCc_name("zdw");
+        customercontact1.setCc_tel(1881);
+
         insertDetail1.add(customercontact);
+        insertDetail1.add(customercontact1);
         customercontactMapper.batchInsert(insertDetail1);
     }
 

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/controller/ProdInOutController.java

@@ -142,7 +142,7 @@ public class ProdInOutController {
      */
     @PostMapping("/batchUnAudit")
     public Result batchUnAudit(@RequestBody BatchDealBaseDTO baseDTOs) {
-        prodInOutService.batchAudit(baseDTOs);
+        prodInOutService.batchUnAudit(baseDTOs);
         return Result.success();
     }
 

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/ProdInOutServiceImpl.java

@@ -300,7 +300,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             //记录日志
             DocBaseDTO docBaseDTO = getBaseDTOById(prodInOutDTO.getId(),pi_class,prodInOutDTO.getPi_inoutno());
             //日志
-            messageLogService.audit(docBaseDTO);
+            messageLogService.unAudit(docBaseDTO);
             return "";
         }
     }
@@ -389,7 +389,10 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
          for (int i = 0;i<sourcePids.size();i++){
              ProdIODetail sourcePid = sourcePids.get(i);
              ProdIODetail targetPid = new ProdIODetail();
-             if(sourcePid.getPd_inqty()-sourcePid.getPd_yqty()>0){
+             pdInqty = sourcePid.getPd_inqty()==null?0:sourcePid.getPd_inqty();
+             pdYqty = sourcePid.getPd_yqty()==null?0:sourcePid.getPd_yqty();
+
+             if(pdInqty-pdYqty>0){
                  targetPid.setPd_piid(pi_id);
                  targetPid.setPd_inoutno(piInoutno);
                  targetPid.setPd_piclass(BillCodeSeq.PURCHASEOUT.getName());
@@ -404,10 +407,10 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
                  //公司id
                  targetPid.setCompanyId(sourcePid.getCompanyId());
                  //本次转单数
-                 targetPid.setPd_outqty(sourcePid.getPd_inqty()-sourcePid.getPd_yqty());
+                 targetPid.setPd_outqty(pdInqty-pdYqty);
                  prodIODetailMapper.insertSelective(targetPid);
                  //更新已转数
-                 sourcePid.setPd_yqty(sourcePid.getPd_inqty());
+                 sourcePid.setPd_yqty(pdInqty);
                  prodIODetailMapper.updateByPrimaryKeySelective(sourcePid);
              }
          }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -340,8 +340,8 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
 
         //检查从表
         for (PurchaseDetail purchaseDetail : purchaseDetails) {
-            pdQty = purchaseDetail.getPd_qty();
-            pdYqty = purchaseDetail.getPd_yqty();
+            pdQty = purchaseDetail.getPd_qty()==null?0:purchaseDetail.getPd_qty();
+            pdYqty = purchaseDetail.getPd_yqty()==null?0:purchaseDetail.getPd_yqty();
             if (pdQty-pdYqty>0){
                 count++;
             }
@@ -377,7 +377,10 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         for (int i=0;i<purchaseDetails.size();i++){
             PurchaseDetail purchaseDetail =purchaseDetails.get(i);
             ProdIODetail prodIODetail = new ProdIODetail();
-            if ((int) (purchaseDetail.getPd_qty()-purchaseDetail.getPd_yqty())>0){
+            pdQty = purchaseDetail.getPd_qty()==null?0:purchaseDetail.getPd_qty();
+            pdYqty = purchaseDetail.getPd_yqty()==null?0:purchaseDetail.getPd_yqty();
+
+            if (pdQty-pdYqty>0){
                 prodIODetail.setPd_piid(pi_id);
                 prodIODetail.setPd_inoutno(piInoutno);
                 prodIODetail.setPd_piclass("采购验收单");
@@ -391,10 +394,10 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 //公司id
                 prodIODetail.setCompanyId(purchaseDetail.getCompanyId());
                 //本次转单数
-                prodIODetail.setPd_inqty((purchaseDetail.getPd_qty()-purchaseDetail.getPd_yqty()));
+                prodIODetail.setPd_inqty(pdQty-pdYqty);
                 prodIODetailMapper.insertSelective(prodIODetail);
                 //更新已转数
-                purchaseDetail.setPd_yqty(purchaseDetail.getPd_qty());
+                purchaseDetail.setPd_yqty(pdQty);
                 purchasedetailMapper.updateByPrimaryKeySelective(purchaseDetail);
             }
         }

applications/purchase/purchase-server/src/main/resources/mapper/ProdIODetailMapper.xml

@@ -550,246 +550,61 @@
     where pd_id = #{pd_id,jdbcType=INTEGER}
   </update>
   <insert id="batchInsert" parameterType="java.util.List" >
+    insert into prodiodetail (pd_piid, pd_inoutno,
+    pd_piclass, pd_pdno, pd_ordercode,
+    pd_orderdetno, pd_prodid, pd_prodcode,
+    pd_unit, pd_inqty, pd_outqty,
+    pd_orderprice, pd_sendprice, pd_price,
+    pd_total, pd_taxrate, pd_netprice,
+    pd_nettotal, pd_whid, pd_whcode,
+    pd_whname, pd_inwhid, pd_inwhcode,
+    pd_inwhname, pd_orderid, pd_sdid,
+    pd_status, companyid, updaterid,
+    updatetime, pd_text1, pd_text2,
+    pd_text3, pd_text4, pd_text5,
+    pd_ym, pd_yqty, pd_ioid,
+    pd_remark) VALUES
     <foreach collection="list" item="item" index="index" open="" close="" separator=",">
-      insert into prodiodetail
-      <trim prefix="(" suffix=")" suffixOverrides=",">
-        <if test="item.pd_piid != null">
-          pd_piid,
-        </if>
-        <if test="item.pd_inoutno != null">
-          pd_inoutno,
-        </if>
-        <if test="item.pd_piclass != null">
-          pd_piclass,
-        </if>
-        <if test="item.pd_pdno != null">
-          pd_pdno,
-        </if>
-        <if test="item.pd_ordercode != null">
-          pd_ordercode,
-        </if>
-        <if test="item.pd_orderdetno != null">
-          pd_orderdetno,
-        </if>
-        <if test="item.pd_prodid != null">
-          pd_prodid,
-        </if>
-        <if test="item.pd_prodcode != null">
-          pd_prodcode,
-        </if>
-        <if test="item.pd_unit != null">
-          pd_unit,
-        </if>
-        <if test="item.pd_inqty != null">
-          pd_inqty,
-        </if>
-        <if test="item.pd_outqty != null">
-          pd_outqty,
-        </if>
-        <if test="item.pd_orderprice != null">
-          pd_orderprice,
-        </if>
-        <if test="item.pd_sendprice != null">
-          pd_sendprice,
-        </if>
-        <if test="item.pd_price != null">
-          pd_price,
-        </if>
-        <if test="item.pd_total != null">
-          pd_total,
-        </if>
-        <if test="item.pd_taxrate != null">
-          pd_taxrate,
-        </if>
-        <if test="item.pd_netprice != null">
-          pd_netprice,
-        </if>
-        <if test="item.pd_nettotal != null">
-          pd_nettotal,
-        </if>
-        <if test="item.pd_whid != null">
-          pd_whid,
-        </if>
-        <if test="item.pd_whcode != null">
-          pd_whcode,
-        </if>
-        <if test="item.pd_whname != null">
-          pd_whname,
-        </if>
-        <if test="item.pd_inwhid != null">
-          pd_inwhid,
-        </if>
-        <if test="item.pd_inwhcode != null">
-          pd_inwhcode,
-        </if>
-        <if test="item.pd_inwhname != null">
-          pd_inwhname,
-        </if>
-        <if test="item.pd_orderid != null">
-          pd_orderid,
-        </if>
-        <if test="item.pd_sdid != null">
-          pd_sdid,
-        </if>
-        <if test="item.pd_status != null">
-          pd_status,
-        </if>
-        <if test="item.companyId != null">
-          companyid,
-        </if>
-        <if test="item.updaterId != null">
-          updaterid,
-        </if>
-        <if test="item.updateTime != null">
-          updatetime,
-        </if>
-        <if test="item.pd_text1 != null">
-          pd_text1,
-        </if>
-        <if test="item.pd_text2 != null">
-          pd_text2,
-        </if>
-        <if test="item.pd_text3 != null">
-          pd_text3,
-        </if>
-        <if test="item.pd_text4 != null">
-          pd_text4,
-        </if>
-        <if test="item.pd_text5 != null">
-          pd_text5,
-        </if>
-        <if test="item.pd_ym != null">
-          pd_ym,
-        </if>
-        <if test="item.pd_yqty != null">
-          pd_yqty,
-        </if>
-        <if test="item.pd_remark != null">
-          pd_remark,
-        </if>
-        <if test="item.pd_ioid != null">
-          pd_ioid,
-        </if>
-      </trim>
-      <trim prefix="values (" suffix=")" suffixOverrides=",">
-        <if test="item.pd_piid != null">
-          #{item.pd_piid,jdbcType=INTEGER},
-        </if>
-        <if test="item.pd_inoutno != null">
-          #{item.pd_inoutno,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_piclass != null">
-          #{item.pd_piclass,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_pdno != null">
-          #{item.pd_pdno,jdbcType=INTEGER},
-        </if>
-        <if test="item.pd_ordercode != null">
-          #{item.pd_ordercode,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_orderdetno != null">
-          #{item.pd_orderdetno,jdbcType=INTEGER},
-        </if>
-        <if test="item.pd_prodid != null">
-          #{item.pd_prodid,jdbcType=INTEGER},
-        </if>
-        <if test="item.pd_prodcode != null">
-          #{item.pd_prodcode,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_unit != null">
-          #{item.pd_unit,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_inqty != null">
-          #{item.pd_inqty,jdbcType=DOUBLE},
-        </if>
-        <if test="item.pd_outqty != null">
-          #{item.pd_outqty,jdbcType=DOUBLE},
-        </if>
-        <if test="item.pd_orderprice != null">
-          #{item.pd_orderprice,jdbcType=DOUBLE},
-        </if>
-        <if test="item.pd_sendprice != null">
-          #{item.pd_sendprice,jdbcType=DOUBLE},
-        </if>
-        <if test="item.pd_price != null">
-          #{item.pd_price,jdbcType=DOUBLE},
-        </if>
-        <if test="item.pd_total != null">
-          #{item.pd_total,jdbcType=DOUBLE},
-        </if>
-        <if test="item.pd_taxrate != null">
-          #{item.pd_taxrate,jdbcType=DOUBLE},
-        </if>
-        <if test="item.pd_netprice != null">
-          #{item.pd_netprice,jdbcType=DOUBLE},
-        </if>
-        <if test="item.pd_nettotal != null">
-          #{item.pd_nettotal,jdbcType=DOUBLE},
-        </if>
-        <if test="item.pd_whid != null">
-          #{item.pd_whid,jdbcType=INTEGER},
-        </if>
-        <if test="item.pd_whcode != null">
-          #{item.pd_whcode,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_whname != null">
-          #{item.pd_whname,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_inwhid != null">
-          #{item.pd_inwhid,jdbcType=INTEGER},
-        </if>
-        <if test="item.pd_inwhcode != null">
-          #{item.pd_inwhcode,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_inwhname != null">
-          #{item.pd_inwhname,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_orderid != null">
-          #{item.pd_orderid,jdbcType=INTEGER},
-        </if>
-        <if test="item.pd_sdid != null">
-          #{item.pd_sdid,jdbcType=INTEGER},
-        </if>
-        <if test="item.pd_status != null">
-          #{item.pd_status,jdbcType=INTEGER},
-        </if>
-        <if test="item.companyId != null">
-          #{item.companyId,jdbcType=INTEGER},
-        </if>
-        <if test="item.updaterId != null">
-          #{item.updaterId,jdbcType=INTEGER},
-        </if>
-        <if test="item.updateTime != null">
-          #{item.updateTime,jdbcType=TIMESTAMP},
-        </if>
-        <if test="item.pd_text1 != null">
-          #{item.pd_text1,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_text2 != null">
-          #{item.pd_text2,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_text3 != null">
-          #{item.pd_text3,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_text4 != null">
-          #{item.pd_text4,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_text5 != null">
-          #{item.pd_text5,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_ym != null">
-          #{item.pd_ym,jdbcType=INTEGER},
-        </if>
-        <if test="item.pd_yqty != null">
-          #{item.pd_yqty,jdbcType=DOUBLE},
-        </if>
-        <if test="item.pd_remark != null">
-          #{item.pd_remark,jdbcType=LONGVARCHAR},
-        </if>
-        <if test="item.pd_ioid != null">
-          #{item.pd_ioid,jdbcType=INTEGER},
-        </if>
-      </trim>
+      (
+      #{item.pd_piid,jdbcType=INTEGER},
+      #{item.pd_inoutno,jdbcType=VARCHAR},
+      #{item.pd_piclass,jdbcType=VARCHAR},
+      #{item.pd_pdno,jdbcType=INTEGER},
+      #{item.pd_ordercode,jdbcType=VARCHAR},
+      #{item.pd_orderdetno,jdbcType=INTEGER},
+      #{item.pd_prodid,jdbcType=INTEGER},
+      #{item.pd_prodcode,jdbcType=VARCHAR},
+      #{item.pd_unit,jdbcType=VARCHAR},
+      #{item.pd_inqty,jdbcType=DOUBLE},
+      #{item.pd_outqty,jdbcType=DOUBLE},
+      #{item.pd_orderprice,jdbcType=DOUBLE},
+      #{item.pd_sendprice,jdbcType=DOUBLE},
+      #{item.pd_price,jdbcType=DOUBLE},
+      #{item.pd_total,jdbcType=DOUBLE},
+      #{item.pd_taxrate,jdbcType=DOUBLE},
+      #{item.pd_netprice,jdbcType=DOUBLE},
+      #{item.pd_nettotal,jdbcType=DOUBLE},
+      #{item.pd_whid,jdbcType=INTEGER},
+      #{item.pd_whcode,jdbcType=VARCHAR},
+      #{item.pd_whname,jdbcType=VARCHAR},
+      #{item.pd_inwhid,jdbcType=INTEGER},
+      #{item.pd_inwhcode,jdbcType=VARCHAR},
+      #{item.pd_inwhname,jdbcType=VARCHAR},
+      #{item.pd_orderid,jdbcType=INTEGER},
+      #{item.pd_sdid,jdbcType=INTEGER},
+      #{item.pd_status,jdbcType=INTEGER},
+      #{item.companyId,jdbcType=INTEGER},
+      #{item.updaterId,jdbcType=INTEGER},
+      #{item.updateTime,jdbcType=TIMESTAMP},
+      #{item.pd_text1,jdbcType=VARCHAR},
+      #{item.pd_text2,jdbcType=VARCHAR},
+      #{item.pd_text3,jdbcType=VARCHAR},
+      #{item.pd_text4,jdbcType=VARCHAR},
+      #{item.pd_text5,jdbcType=VARCHAR},
+      #{item.pd_ym,jdbcType=INTEGER},
+      #{item.pd_yqty,jdbcType=DOUBLE},
+      #{item.pd_remark,jdbcType=LONGVARCHAR},
+      #{item.pd_ioid,jdbcType=INTEGER})
     </foreach>
   </insert>
 

applications/purchase/purchase-server/src/test/PurchaseTest.java

@@ -1,4 +1,6 @@
 import com.usoftchina.saas.purchase.PurchaseApplication;
+import com.usoftchina.saas.purchase.mapper.ProdIODetailMapper;
+import com.usoftchina.saas.purchase.po.ProdIODetail;
 import com.usoftchina.saas.purchase.service.ProdInOutService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -7,6 +9,9 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = PurchaseApplication.class)
 @EnableAutoConfiguration
@@ -14,9 +19,27 @@ public class PurchaseTest {
 
     @Autowired
     private ProdInOutService prodInOutService;
+    @Autowired
+    private ProdIODetailMapper prodIODetailMapper;
+
 
     @Test
     public void test(){
+        List<ProdIODetail> list = new ArrayList<>();
+        ProdIODetail prodIODetail1 = new ProdIODetail();
+        prodIODetail1.setPd_piid(new Long(1));
+        prodIODetail1.setCompanyId(-1);
+        prodIODetail1.setPd_inoutno("test01");
+
+
+        ProdIODetail prodIODetail2 = new ProdIODetail();
+        prodIODetail2.setPd_piid(new Long(1));
+        prodIODetail2.setCompanyId(-1);
+        prodIODetail2.setPd_inoutno("test02");
+
+        list.add(prodIODetail1);
+        list.add(prodIODetail2);
 
+        prodIODetailMapper.batchInsert(list);
     }
 }

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/controller/SaleController.java

@@ -163,4 +163,8 @@ public class SaleController {
         return Result.success();
     }
 
+    @GetMapping("/test")
+    public String test() {
+        return "配置构建success";
+    }
 }

applications/sale/sale-server/src/main/resources/mapper/SaleMapper.xml

@@ -372,7 +372,7 @@
   </update>
 
   <update id="updateNetTotal" parameterType="long">
-    update saledetail a set sd_nettotal=round(ifnull(sd_netprice,0)*nvl(sd_qty,0),2)
+    update saledetail a set sd_nettotal=round(ifnull(sd_netprice,0)*ifnull(sd_qty,0),2)
     where sd_said=#{id}
   </update>
 </mapper>

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/controller/ProdInOutController.java

@@ -142,7 +142,7 @@ public class ProdInOutController {
      */
     @PostMapping("/batchUnAudit")
     public Result batchUnAudit(@RequestBody BatchDealBaseDTO baseDTOs) {
-        prodInOutService.batchAudit(baseDTOs);
+        prodInOutService.batchUnAudit(baseDTOs);
         return Result.success();
     }
 

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/service/impl/ProdInoutServiceImpl.java

@@ -292,7 +292,7 @@ public class ProdInoutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             //记录日志
             DocBaseDTO docBaseDTO = getBaseDTOById(prodInOutDTO.getId(),pi_class,prodInOutDTO.getPi_inoutno());
             //日志
-            messageLogService.audit(docBaseDTO);
+            messageLogService.unAudit(docBaseDTO);
             return "";
         }
     }

applications/storage/storage-server/src/main/resources/mapper/ProdIODetailMapper.xml

@@ -550,246 +550,61 @@
     where pd_id = #{pd_id,jdbcType=INTEGER}
   </update>
   <insert id="batchInsert" parameterType="java.util.List" >
+    insert into prodiodetail (pd_piid, pd_inoutno,
+    pd_piclass, pd_pdno, pd_ordercode,
+    pd_orderdetno, pd_prodid, pd_prodcode,
+    pd_unit, pd_inqty, pd_outqty,
+    pd_orderprice, pd_sendprice, pd_price,
+    pd_total, pd_taxrate, pd_netprice,
+    pd_nettotal, pd_whid, pd_whcode,
+    pd_whname, pd_inwhid, pd_inwhcode,
+    pd_inwhname, pd_orderid, pd_sdid,
+    pd_status, companyid, updaterid,
+    updatetime, pd_text1, pd_text2,
+    pd_text3, pd_text4, pd_text5,
+    pd_ym, pd_yqty, pd_ioid,
+    pd_remark) VALUES
     <foreach collection="list" item="item" index="index" open="" close="" separator=",">
-      insert into prodiodetail
-      <trim prefix="(" suffix=")" suffixOverrides=",">
-        <if test="item.pd_piid != null">
-          pd_piid,
-        </if>
-        <if test="item.pd_inoutno != null">
-          pd_inoutno,
-        </if>
-        <if test="item.pd_piclass != null">
-          pd_piclass,
-        </if>
-        <if test="item.pd_pdno != null">
-          pd_pdno,
-        </if>
-        <if test="item.pd_ordercode != null">
-          pd_ordercode,
-        </if>
-        <if test="item.pd_orderdetno != null">
-          pd_orderdetno,
-        </if>
-        <if test="item.pd_prodid != null">
-          pd_prodid,
-        </if>
-        <if test="item.pd_prodcode != null">
-          pd_prodcode,
-        </if>
-        <if test="item.pd_unit != null">
-          pd_unit,
-        </if>
-        <if test="item.pd_inqty != null">
-          pd_inqty,
-        </if>
-        <if test="item.pd_outqty != null">
-          pd_outqty,
-        </if>
-        <if test="item.pd_orderprice != null">
-          pd_orderprice,
-        </if>
-        <if test="item.pd_sendprice != null">
-          pd_sendprice,
-        </if>
-        <if test="item.pd_price != null">
-          pd_price,
-        </if>
-        <if test="item.pd_total != null">
-          pd_total,
-        </if>
-        <if test="item.pd_taxrate != null">
-          pd_taxrate,
-        </if>
-        <if test="item.pd_netprice != null">
-          pd_netprice,
-        </if>
-        <if test="item.pd_nettotal != null">
-          pd_nettotal,
-        </if>
-        <if test="item.pd_whid != null">
-          pd_whid,
-        </if>
-        <if test="item.pd_whcode != null">
-          pd_whcode,
-        </if>
-        <if test="item.pd_whname != null">
-          pd_whname,
-        </if>
-        <if test="item.pd_inwhid != null">
-          pd_inwhid,
-        </if>
-        <if test="item.pd_inwhcode != null">
-          pd_inwhcode,
-        </if>
-        <if test="item.pd_inwhname != null">
-          pd_inwhname,
-        </if>
-        <if test="item.pd_orderid != null">
-          pd_orderid,
-        </if>
-        <if test="item.pd_sdid != null">
-          pd_sdid,
-        </if>
-        <if test="item.pd_status != null">
-          pd_status,
-        </if>
-        <if test="item.companyId != null">
-          companyid,
-        </if>
-        <if test="item.updaterId != null">
-          updaterid,
-        </if>
-        <if test="item.updateTime != null">
-          updatetime,
-        </if>
-        <if test="item.pd_text1 != null">
-          pd_text1,
-        </if>
-        <if test="item.pd_text2 != null">
-          pd_text2,
-        </if>
-        <if test="item.pd_text3 != null">
-          pd_text3,
-        </if>
-        <if test="item.pd_text4 != null">
-          pd_text4,
-        </if>
-        <if test="item.pd_text5 != null">
-          pd_text5,
-        </if>
-        <if test="item.pd_ym != null">
-          pd_ym,
-        </if>
-        <if test="item.pd_yqty != null">
-          pd_yqty,
-        </if>
-        <if test="item.pd_remark != null">
-          pd_remark,
-        </if>
-        <if test="item.pd_ioid != null">
-          pd_ioid,
-        </if>
-      </trim>
-      <trim prefix="values (" suffix=")" suffixOverrides=",">
-        <if test="item.pd_piid != null">
-          #{item.pd_piid,jdbcType=INTEGER},
-        </if>
-        <if test="item.pd_inoutno != null">
-          #{item.pd_inoutno,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_piclass != null">
-          #{item.pd_piclass,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_pdno != null">
-          #{item.pd_pdno,jdbcType=INTEGER},
-        </if>
-        <if test="item.pd_ordercode != null">
-          #{item.pd_ordercode,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_orderdetno != null">
-          #{item.pd_orderdetno,jdbcType=INTEGER},
-        </if>
-        <if test="item.pd_prodid != null">
-          #{item.pd_prodid,jdbcType=INTEGER},
-        </if>
-        <if test="item.pd_prodcode != null">
-          #{item.pd_prodcode,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_unit != null">
-          #{item.pd_unit,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_inqty != null">
-          #{item.pd_inqty,jdbcType=DOUBLE},
-        </if>
-        <if test="item.pd_outqty != null">
-          #{item.pd_outqty,jdbcType=DOUBLE},
-        </if>
-        <if test="item.pd_orderprice != null">
-          #{item.pd_orderprice,jdbcType=DOUBLE},
-        </if>
-        <if test="item.pd_sendprice != null">
-          #{item.pd_sendprice,jdbcType=DOUBLE},
-        </if>
-        <if test="item.pd_price != null">
-          #{item.pd_price,jdbcType=DOUBLE},
-        </if>
-        <if test="item.pd_total != null">
-          #{item.pd_total,jdbcType=DOUBLE},
-        </if>
-        <if test="item.pd_taxrate != null">
-          #{item.pd_taxrate,jdbcType=DOUBLE},
-        </if>
-        <if test="item.pd_netprice != null">
-          #{item.pd_netprice,jdbcType=DOUBLE},
-        </if>
-        <if test="item.pd_nettotal != null">
-          #{item.pd_nettotal,jdbcType=DOUBLE},
-        </if>
-        <if test="item.pd_whid != null">
-          #{item.pd_whid,jdbcType=INTEGER},
-        </if>
-        <if test="item.pd_whcode != null">
-          #{item.pd_whcode,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_whname != null">
-          #{item.pd_whname,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_inwhid != null">
-          #{item.pd_inwhid,jdbcType=INTEGER},
-        </if>
-        <if test="item.pd_inwhcode != null">
-          #{item.pd_inwhcode,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_inwhname != null">
-          #{item.pd_inwhname,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_orderid != null">
-          #{item.pd_orderid,jdbcType=INTEGER},
-        </if>
-        <if test="item.pd_sdid != null">
-          #{item.pd_sdid,jdbcType=INTEGER},
-        </if>
-        <if test="item.pd_status != null">
-          #{item.pd_status,jdbcType=INTEGER},
-        </if>
-        <if test="item.companyId != null">
-          #{item.companyId,jdbcType=INTEGER},
-        </if>
-        <if test="item.updaterId != null">
-          #{item.updaterId,jdbcType=INTEGER},
-        </if>
-        <if test="item.updateTime != null">
-          #{item.updateTime,jdbcType=TIMESTAMP},
-        </if>
-        <if test="item.pd_text1 != null">
-          #{item.pd_text1,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_text2 != null">
-          #{item.pd_text2,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_text3 != null">
-          #{item.pd_text3,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_text4 != null">
-          #{item.pd_text4,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_text5 != null">
-          #{item.pd_text5,jdbcType=VARCHAR},
-        </if>
-        <if test="item.pd_ym != null">
-          #{item.pd_ym,jdbcType=INTEGER},
-        </if>
-        <if test="item.pd_yqty != null">
-          #{item.pd_yqty,jdbcType=DOUBLE},
-        </if>
-        <if test="item.pd_remark != null">
-          #{item.pd_remark,jdbcType=LONGVARCHAR},
-        </if>
-        <if test="item.pd_ioid != null">
-          #{item.pd_ioid,jdbcType=INTEGER},
-        </if>
-      </trim>
+      (
+      #{item.pd_piid,jdbcType=INTEGER},
+      #{item.pd_inoutno,jdbcType=VARCHAR},
+      #{item.pd_piclass,jdbcType=VARCHAR},
+      #{item.pd_pdno,jdbcType=INTEGER},
+      #{item.pd_ordercode,jdbcType=VARCHAR},
+      #{item.pd_orderdetno,jdbcType=INTEGER},
+      #{item.pd_prodid,jdbcType=INTEGER},
+      #{item.pd_prodcode,jdbcType=VARCHAR},
+      #{item.pd_unit,jdbcType=VARCHAR},
+      #{item.pd_inqty,jdbcType=DOUBLE},
+      #{item.pd_outqty,jdbcType=DOUBLE},
+      #{item.pd_orderprice,jdbcType=DOUBLE},
+      #{item.pd_sendprice,jdbcType=DOUBLE},
+      #{item.pd_price,jdbcType=DOUBLE},
+      #{item.pd_total,jdbcType=DOUBLE},
+      #{item.pd_taxrate,jdbcType=DOUBLE},
+      #{item.pd_netprice,jdbcType=DOUBLE},
+      #{item.pd_nettotal,jdbcType=DOUBLE},
+      #{item.pd_whid,jdbcType=INTEGER},
+      #{item.pd_whcode,jdbcType=VARCHAR},
+      #{item.pd_whname,jdbcType=VARCHAR},
+      #{item.pd_inwhid,jdbcType=INTEGER},
+      #{item.pd_inwhcode,jdbcType=VARCHAR},
+      #{item.pd_inwhname,jdbcType=VARCHAR},
+      #{item.pd_orderid,jdbcType=INTEGER},
+      #{item.pd_sdid,jdbcType=INTEGER},
+      #{item.pd_status,jdbcType=INTEGER},
+      #{item.companyId,jdbcType=INTEGER},
+      #{item.updaterId,jdbcType=INTEGER},
+      #{item.updateTime,jdbcType=TIMESTAMP},
+      #{item.pd_text1,jdbcType=VARCHAR},
+      #{item.pd_text2,jdbcType=VARCHAR},
+      #{item.pd_text3,jdbcType=VARCHAR},
+      #{item.pd_text4,jdbcType=VARCHAR},
+      #{item.pd_text5,jdbcType=VARCHAR},
+      #{item.pd_ym,jdbcType=INTEGER},
+      #{item.pd_yqty,jdbcType=DOUBLE},
+      #{item.pd_remark,jdbcType=LONGVARCHAR},
+      #{item.pd_ioid,jdbcType=INTEGER})
     </foreach>
   </insert>
 

frontend/saas-web/Readme.md

@@ -66,10 +66,10 @@ viewModel: view.core.form.FormPanelModel
 | codeField | 编号字段 | √ | "pu_code" |
 | statusField | 状态字段 | √ | "pu_status" |
 | statusCodeField | 状态码字段 | √ |  "pu_statuscode" |
-| readUrl | 取数接口 | √ | basePath + "purchase/purchase/read" |
-| saveUrl | 保存接口 | √ | basePath + "purchase/purchase/save" |
-| auditUrl | 审核接口 | √ | basePath + "purchase/purchase/audit" |
-| deleteUrl | 删除接口 | √ | basePath + "purchase/purchase/delete" |
+| readUrl | 取数接口 | √ | "/api/purchase/purchase/read" |
+| saveUrl | 保存接口 | √ | "/api/purchase/purchase/save" |
+| auditUrl | 审核接口 | √ | "/api/purchase/purchase/audit" |
+| deleteUrl | 删除接口 | √ | "/api/purchase/purchase/delete" |
 | toolBtns | 自定义按钮 | x | [ Button ] |
 | defaultItems | 界面字段 | √ | [ Field ]|
 
@@ -92,7 +92,7 @@ viewModel: view.core.form.FormPanelModel
 | storeModel | grid model | √ | "saas.model.purchase.purchasedetail" |
 | detnoColumn | 序号列，配置该项后无需再columns定义序号列 | √ | "pud_detno" |
 | columns[i].ignore | 是否忽略，为真时在调用保存方法时不会取到该列值 | x | true |
-| deleteDetailUrl | 删除明细接口 | √ | basePath + "purchase/purchase/deleteItem" |
+| deleteDetailUrl | 删除明细接口 | √ | "/api/purchase/purchase/deleteItem" |
 - 需要根据columns在models文件夹下添加storeModel对应的Model
 
 ---
@@ -140,7 +140,7 @@ viewModel: view.core.query.QueryPanelModel
 | addTitle | 单据名称，新增tab标题 | √ | "采购单" |
 | addXtype | 主从表单据xtype | √ | "purchase-purchase-formpanel" |
 | defaultCondition | 默认条件 | x | "pu_class='采购单'" |
-| baseVastUrl | 查询列表接口 | √ | basePath + "purchase/purchase/" |
+| baseVastUrl | 查询列表接口 | √ | "/api/purchase/purchase/" |
 | baseColumn | 基础列配置 | √ | [ Column ] |
 | relativeColumn | 关联列设置 | x | [ Column ] |
 

frontend/saas-web/app.json

@@ -291,6 +291,10 @@
         },
         "compressor": {
             "type": "yui"
+        },
+        "server": {
+            "basePath": "http://192.168.0.181:8560",
+            "urlPattern": "^\/api\/"
         }
     },
 
@@ -298,6 +302,10 @@
      * Settings specific to testing builds.
      */
     "testing": {
+        "server": {
+            "basePath": "http://192.168.0.181:8560",
+            "urlPattern": "^\/api\/"
+        }
     },
 
     /**
@@ -306,6 +314,10 @@
     "development": {
         "watch": {
             "delay": 250
+        },
+        "server": {
+            "basePath": "http://192.168.0.181:8560",
+            "urlPattern": "^\/api\/"
         }
     },
 

frontend/saas-web/app/util/FormUtil.js

@@ -3,7 +3,7 @@ Ext.define('saas.util.FormUtil', {
     BaseUtil: Ext.create('saas.util.BaseUtil'),
 
     // 请求页面组件接口模板
-    baseUrl: basePath+'ui/co_view/config?name={viewName}',
+    baseUrl: '/api/ui/co_view/config?name={viewName}',
     // 模板替换正则
     urlRe: /(.*){viewName}(.*)/g,
     
@@ -145,7 +145,7 @@ Ext.define('saas.util.FormUtil', {
         }else{
             //取后台编号
             me.BaseUtil.request({
-                url: basePath + 'commons/number/getMaxnumber',
+                url: '/api/commons/number/getMaxnumber',
                 headers: {
                     "Content-Type": 'application/x-www-form-urlencoded;charset=UTF-8'
                 },

frontend/saas-web/app/view/core/query/QueryGridPanel.js

@@ -48,8 +48,14 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                     },
                     listeners: {
                         exception: function(proxy, response, operation, eOpts) {
-                            console.error('exception: ', response.responseJson.message);
-                            showToast('exception：' + response.responseJson.message);
+                            if(operation.success) {
+                                if(response.timedout) {
+                                    showToast('请求超时');
+                                }
+                            }else {
+                                console.error('exception: ', response.responseJson);
+                                showToast('exception：' + response.responseJson);
+                            }
                         }
                     }
                 },
@@ -237,8 +243,10 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
     },
     onCloseOrder:function(me){
         console.log("关闭订单");
+        me.up('grid').vastOperation("batchClose");
     },onOpenOrder:function(me){
         console.log("开启订单");
+        me.up('grid').vastOperation("batchOpen");
     },
     onDelete: function (btn) {
         btn.up('grid').vastOperation("batchDelete");

frontend/saas-web/app/view/document/bom/BasePanel.js

@@ -10,16 +10,16 @@ Ext.define('saas.view.document.bom.BasePanel', {
     //字段属性
     _formXtype:'document-bom-formpanel',
     _title:'BOM资料',
-    // _dataUrl:basePath+'ducument/customer/list',
-    _batchOpenUrl:basePath+'document/bom/batchOpen',
-    _batchCloseUrl:basePath+'document/bom/batchClose',
-    _batchDeleteUrl:basePath+'document/bom/batchDelete',
+    // _dataUrl:'/api/ducument/customer/list',
+    _batchOpenUrl:'/api/document/bom/batchOpen',
+    _batchCloseUrl:'/api/document/bom/batchClose',
+    _batchDeleteUrl:'/api/document/bom/batchDelete',
 
     gridConfig: {
         idField: 'id',
         codeField: 'bo_mothercode',
         statusCodeField:'bo_statuscode',
-        dataUrl: basePath+'document/bom/list',
+        dataUrl: '/api/document/bom/list',
         columns : [{
             text : "id", 
             width : 0, 

frontend/saas-web/app/view/document/bom/FormPanel.js

@@ -13,11 +13,11 @@ Ext.define('saas.view.document.bom.FormPanel', {
     _codeField: 'bo_mothercode',
     _statusField: 'bo_status',
     _statusCodeField: 'bo_statuscode',
-    _readUrl:basePath+'document/bom/read/',
-    _saveUrl:basePath+'document/bom/save',
-    _openUrl:basePath+'document/bom/open',
-    _closeUrl:basePath+'document/bom/close',
-    _deleteUrl:basePath+'document/bom/delete/',
+    _readUrl:'/api/document/bom/read/',
+    _saveUrl:'/api/document/bom/save',
+    _openUrl:'/api/document/bom/open',
+    _closeUrl:'/api/document/bom/close',
+    _deleteUrl:'/api/document/bom/delete/',
     initId:0,
 
     defaultItems: [{
@@ -74,7 +74,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn:  'bd_detno',
         storeModel:'saas.model.document.bomdetail',
-        deleteDetailUrl:basePath+'document/bom/deleteDetail/',
+        deleteDetailUrl:'/api/document/bom/deleteDetail/',
         columns : [
             {
                 text : "ID", 

frontend/saas-web/app/view/document/customer/BasePanel.js

@@ -7,7 +7,7 @@ Ext.define('saas.view.document.customer.BasePanel', {
 
     searchField:[{
         xtype : "remotecombo", 
-        storeUrl:basePath+'document/customerkind/getCombo',
+        storeUrl:'/api/document/customerkind/getCombo',
         name : "cu_type", 
         emptyText : "请选择客户类型", 
         allowBlank : true, 
@@ -19,8 +19,8 @@ Ext.define('saas.view.document.customer.BasePanel', {
             customerkind:{
                 keyField:'id',
                 dataField:'ck_name',
-                reqUrl:basePath+'document/customerkind/save',
-                delUrl:basePath+'document/customerkind/delete'
+                reqUrl:'/api/document/customerkind/save',
+                delUrl:'/api/document/customerkind/delete'
             }
         },
         addHandler:function(b){
@@ -43,16 +43,16 @@ Ext.define('saas.view.document.customer.BasePanel', {
     //字段属性
     _formXtype:'document-customer-formpanel',
     _title:'客户资料',
-    // _dataUrl:basePath+'ducument/customer/list',
-    _batchOpenUrl:basePath+'document/customer/batchOpen',
-    _batchCloseUrl:basePath+'document/customer/batchClose',
-    _batchDeleteUrl:basePath+'document/customer/batchDelete',
+    // _dataUrl:'/api/ducument/customer/list',
+    _batchOpenUrl:'/api/document/customer/batchOpen',
+    _batchCloseUrl:'/api/document/customer/batchClose',
+    _batchDeleteUrl:'/api/document/customer/batchDelete',
 
     gridConfig: {
         idField: 'id',
         codeField: 'cu_code',
         statusCodeField:'cu_statuscode',
-        dataUrl: basePath+'document/customer/list',
+        dataUrl: '/api/document/customer/list',
         columns : [{
             text : "客户id", 
             width : 0, 

frontend/saas-web/app/view/document/customer/FormPanel.js

@@ -13,11 +13,11 @@ Ext.define('saas.view.document.customer.FormPanel', {
     _codeField: 'cu_code',
     _statusField: 'cu_status',
     _statusCodeField: 'cu_statuscode',
-    _readUrl:basePath+'document/customer/read/',
-    _saveUrl:basePath+'document/customer/save',
-    _openUrl:basePath+'document/customer/open',
-    _closeUrl:basePath+'document/customer/close',
-    _deleteUrl:basePath+'document/customer/delete/',
+    _readUrl:'/api/document/customer/read/',
+    _saveUrl:'/api/document/customer/save',
+    _openUrl:'/api/document/customer/open',
+    _closeUrl:'/api/document/customer/close',
+    _deleteUrl:'/api/document/customer/delete/',
     initId:0,
 
     defaultItems: [{
@@ -52,7 +52,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         columnWidth: 0.25
     },{
         xtype : "remotecombo", 
-        storeUrl:basePath+'document/customerkind/getCombo',
+        storeUrl:'/api/document/customerkind/getCombo',
         name : "cu_type", 
         fieldLabel : "客户类型", 
         allowBlank : true, 
@@ -64,8 +64,8 @@ Ext.define('saas.view.document.customer.FormPanel', {
             customerkind:{
                 keyField:'id',
                 dataField:'ck_name',
-                reqUrl:basePath+'document/customerkind/save',
-                delUrl:basePath+'document/customerkind/delete'
+                reqUrl:'/api/document/customerkind/save',
+                delUrl:'/api/document/customerkind/delete'
             }
         },
         addHandler:function(b){
@@ -150,7 +150,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn:  'cc_detno',
         storeModel:'saas.model.document.customercontact',
-        deleteDetailUrl:basePath+'document/customer/deletecontact/',
+        deleteDetailUrl:'/api/document/customer/deletecontact/',
         columns : [
             {
                 text : "ID", 
@@ -242,7 +242,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn:  'ca_detno',
         storeModel:'saas.model.document.customeraddress',
-        deleteDetailUrl:basePath+'document/customer/deleteaddress/',
+        deleteDetailUrl:'/api/document/customer/deleteaddress/',
         columns : [
             {
                 text : "ID", 

frontend/saas-web/app/view/document/kind/Kind.js

@@ -70,8 +70,8 @@ Ext.define('saas.view.document.kind.Kind', {
                 flex: 1
             }],
             keyField:'id',
-            reqUrl:basePath + 'document/customerkind/save',
-            delUrl:basePath + 'document/customerkind/delete'
+            reqUrl:'/api/document/customerkind/save',
+            delUrl:'/api/document/customerkind/delete'
         },
         vendorkind:{
             columns: [{
@@ -80,8 +80,8 @@ Ext.define('saas.view.document.kind.Kind', {
                 flex: 1
             }],
             keyField:'id',
-            reqUrl:basePath + 'document/vendorkind/save',
-            delUrl:basePath + 'document/vendorkind/delete'
+            reqUrl:'/api/document/vendorkind/save',
+            delUrl:'/api/document/vendorkind/delete'
         },
         productkind:{
             columns: [{
@@ -90,8 +90,8 @@ Ext.define('saas.view.document.kind.Kind', {
                 flex: 1
             }],
             keyField:'id',
-            reqUrl:basePath + 'document/producttype/save',
-            delUrl:basePath + 'document/producttype/delete'
+            reqUrl:'/api/document/producttype/save',
+            delUrl:'/api/document/producttype/delete'
         },
         productbrand:{
             columns: [{
@@ -100,8 +100,8 @@ Ext.define('saas.view.document.kind.Kind', {
                 flex: 1
             }],
             keyField:'id',
-            reqUrl:basePath + 'document/productbrand/save',
-            delUrl:basePath + 'document/productbrand/delete'
+            reqUrl:'/api/document/productbrand/save',
+            delUrl:'/api/document/productbrand/delete'
         },
         bankinformation:{
             columns: [{
@@ -131,8 +131,8 @@ Ext.define('saas.view.document.kind.Kind', {
                 flex: 1
             }],
             keyField:'id',
-            reqUrl: basePath + 'document/bankinformation/save',
-            delUrl: basePath + 'document/bankinformation/delete'
+            reqUrl: '/api/document/bankinformation/save',
+            delUrl: '/api/document/bankinformation/delete'
         },
         inoutkind:{
             columns: [{
@@ -141,8 +141,8 @@ Ext.define('saas.view.document.kind.Kind', {
                 flex: 1
             }],
             keyField:'id',
-            reqUrl: basePath + 'document/fundinouttype/save',
-            delUrl: basePath + 'document/fundinouttype/delete'
+            reqUrl: '/api/document/fundinouttype/save',
+            delUrl: '/api/document/fundinouttype/delete'
         },
         warehouse:{
             columns: [{
@@ -164,7 +164,7 @@ Ext.define('saas.view.document.kind.Kind', {
                 xtype: 'actioncolumn',
                 align : 'center',
                 items: [{
-                    icon:basePath + 'resource/images/16/lock_bg.png',
+                    icon:'/api/resource/images/16/lock_bg.png',
                     tooltip: '锁定',
                     iconCls:'',
                     getClass: function(v, meta, rec) {
@@ -201,8 +201,8 @@ Ext.define('saas.view.document.kind.Kind', {
                 }]
             }],
             keyField:'id',
-            reqUrl: basePath + 'document/warehouse/save',
-            delUrl: basePath + 'document/warehouse/delete'
+            reqUrl: '/api/document/warehouse/save',
+            delUrl: '/api/document/warehouse/delete'
         }
     }
 })

frontend/saas-web/app/view/document/kind/KindModel.js

@@ -15,7 +15,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             ],
             proxy: {
                 type: 'ajax',
-                url: basePath + 'document/customerkind/list',
+                url: '/api/document/customerkind/list',
                 actionMethods: {
                     read: 'GET'
                 },
@@ -34,7 +34,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             ],
             proxy: {
                 type: 'ajax',
-                url: basePath + 'document/vendorkind/list',
+                url: '/api/document/vendorkind/list',
                 actionMethods: {
                     read: 'GET'
                 },
@@ -53,7 +53,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             ],
             proxy: {
                 type: 'ajax',
-                url: basePath + 'document/producttype/list',
+                url: '/api/document/producttype/list',
                 actionMethods: {
                     read: 'GET'
                 },
@@ -72,7 +72,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             ],
             proxy: {
                 type: 'ajax',
-                url: basePath + 'document/productbrand/list',
+                url: '/api/document/productbrand/list',
                 actionMethods: {
                     read: 'GET'
                 },
@@ -96,7 +96,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             ],
             proxy: {
                 type: 'ajax',
-                url: basePath + 'document/bankinformation/list',
+                url: '/api/document/bankinformation/list',
                 actionMethods: {
                     read: 'GET'
                 },
@@ -116,7 +116,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             ],
             proxy: {  
                 type: 'ajax',
-                url: basePath + 'document/fundinouttype/list',
+                url: '/api/document/fundinouttype/list',
                 actionMethods: {
                     read: 'GET'
                 },
@@ -138,7 +138,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             ],
             proxy: {
                 type: 'ajax',
-                url: basePath + 'document/warehouse/list',
+                url: '/api/document/warehouse/list',
                 actionMethods: {
                     read: 'GET'
                 },

frontend/saas-web/app/view/document/product/BasePanel.js

@@ -7,7 +7,7 @@ Ext.define('saas.view.document.product.BasePanel', {
 
     searchField:[{
         xtype : "remotecombo", 
-        storeUrl: basePath + 'document/producttype/getCombo',
+        storeUrl: '/api/document/producttype/getCombo',
         name : "pr_type", 
         emptyText : "请选择物料类型", 
         allowBlank : true, 
@@ -19,8 +19,8 @@ Ext.define('saas.view.document.product.BasePanel', {
             producttype:{
                 keyField:'id',
                 dataField:'pr_name',
-                reqUrl:basePath + 'document/producttype/save',
-                delUrl:basePath + 'document/producttype/delete'
+                reqUrl:'/api/document/producttype/save',
+                delUrl:'/api/document/producttype/delete'
             }
         },
         addHandler:function(b){
@@ -44,15 +44,15 @@ Ext.define('saas.view.document.product.BasePanel', {
     _formXtype:'document-product-formpanel',
     _title:'物料资料',
     // _dataUrl:'http://192.168.253.31:9480/product/list',
-    _batchOpenUrl:basePath + 'document/product/batchOpen',
-    _batchCloseUrl:basePath + 'document/product/batchClose',
-    _batchDeleteUrl:basePath + 'document/product/batchDelete',
+    _batchOpenUrl:'/api/document/product/batchOpen',
+    _batchCloseUrl:'/api/document/product/batchClose',
+    _batchDeleteUrl:'/api/document/product/batchDelete',
 
     gridConfig: {
         idField: 'id',
         codeField: 'pr_code',
         statusCodeField:'pr_statuscode',
-        dataUrl: basePath + 'document/product/list',
+        dataUrl: '/api/document/product/list',
         columns : [{
             text : "id", 
             width : 0, 

frontend/saas-web/app/view/document/product/FormController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.document.product.FormController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:basePath + 'document/vendor/getVendorsByCondition',
+                        dataUrl:'/api/document/vendor/getVendorsByCondition',
                         //赋值 
                         dbfinds:[{
                             from:'ve_code',to:'pr_vendcode'
@@ -70,7 +70,7 @@ Ext.define('saas.view.document.product.FormController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:basePath + 'document/product/getWareHouseByCondition',
+                        dataUrl:'/api/document/product/getWareHouseByCondition',
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'wh_code',to:'pr_whcode'

frontend/saas-web/app/view/document/product/FormPanel.js

@@ -13,11 +13,11 @@ Ext.define('saas.view.document.product.FormPanel', {
     _codeField: 'pr_code',
     _statusField: 'pr_status',
     _statusCodeField: 'pr_statuscode',
-    _readUrl:basePath + 'document/product/read/',
-    _saveUrl:basePath + 'document/product/save',
-    _openUrl:basePath + 'document/product/open',
-    _closeUrl:basePath + 'document/product/close',
-    _deleteUrl:basePath + 'document/product/delete/',
+    _readUrl:'/api/document/product/read/',
+    _saveUrl:'/api/document/product/save',
+    _openUrl:'/api/document/product/open',
+    _closeUrl:'/api/document/product/close',
+    _deleteUrl:'/api/document/product/delete/',
     initId:0,
 
     defaultItems: [{
@@ -52,7 +52,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         columnWidth: 0.25
     },{
         xtype : "remotecombo", 
-        storeUrl:basePath + 'document/producttype/getCombo',
+        storeUrl:'/api/document/producttype/getCombo',
         name : "pr_type", 
         fieldLabel : "物料类型", 
         allowBlank : true, 
@@ -64,8 +64,8 @@ Ext.define('saas.view.document.product.FormPanel', {
             producttype:{
                 keyField:'id',
                 dataField:'pr_name',
-                reqUrl:basePath + 'document/producttype/save',
-                delUrl:basePath + 'document/producttype/delete'
+                reqUrl:'/api/document/producttype/save',
+                delUrl:'/api/document/producttype/delete'
             }
         },
         addHandler:function(b){
@@ -85,7 +85,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         }
     },{
         xtype : "remotecombo", 
-        storeUrl:basePath+'document/product/getProdUnit',
+        storeUrl:'/api/document/product/getProdUnit',
         name : "pr_unit", 
         bind : "{pr_unit}", 
         fieldLabel : "物料单位", 
@@ -98,8 +98,8 @@ Ext.define('saas.view.document.product.FormPanel', {
             produnit:{
                 keyField:'id',
                 dataField:'vk_name',
-                reqUrl:basePath+'document/produnit/save',
-                delUrl:basePath+'document/produnit/delete'
+                reqUrl:'/api/document/produnit/save',
+                delUrl:'/api/document/produnit/delete'
             }
         },
         addHandler:function(b){
@@ -119,7 +119,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         }
     },{
         xtype : "remotecombo", 
-        storeUrl:basePath+'document/product/getProdBrand',
+        storeUrl:'/api/document/product/getProdBrand',
         name : "pr_brand", 
         bind : "{pr_brand}", 
         fieldLabel : "物料品牌", 
@@ -132,8 +132,8 @@ Ext.define('saas.view.document.product.FormPanel', {
             productbrand:{
                 keyField:'id',
                 dataField:'pb_name',
-                reqUrl:basePath+'document/productbrand/save',
-                delUrl:basePath+'document/productbrand/delete'
+                reqUrl:'/api/document/productbrand/save',
+                delUrl:'/api/document/productbrand/delete'
             }
         },
         addHandler:function(b){

frontend/saas-web/app/view/document/vendor/BasePanel.js

@@ -6,7 +6,7 @@ Ext.define('saas.view.document.vendor.BasePanel', {
 
     searchField:[{
         xtype : "remotecombo", 
-        storeUrl:basePath+'document/vendorkind/getCombo',
+        storeUrl:'/api/document/vendorkind/getCombo',
         name : "ve_type", 
         emptyText : "请选择供应商类型", 
         allowBlank : true, 
@@ -18,8 +18,8 @@ Ext.define('saas.view.document.vendor.BasePanel', {
             vendorkind:{
                 keyField:'id',
                 dataField:'vk_name',
-                reqUrl:basePath+'document/vendorkind/save',
-                delUrl:basePath+'document/vendorkind/delete'
+                reqUrl:'/api/document/vendorkind/save',
+                delUrl:'/api/document/vendorkind/delete'
             }
         },
         addHandler:function(b){
@@ -42,17 +42,17 @@ Ext.define('saas.view.document.vendor.BasePanel', {
     //字段属性
     _formXtype:'document-vendor-formpanel',
     _title:'供应商资料',
-    // _dataUrl:basePath+'ducument/vendor/list',
-    _deleteUrl:basePath+'document/vendor/delete/',
-    _batchOpenUrl:basePath+'document/vendor/batchOpen',
-    _batchCloseUrl:basePath+'document/vendor/batchClose',
-    _batchDeleteUrl:basePath+'document/vendor/batchDelete',
+    // _dataUrl:'/api/ducument/vendor/list',
+    _deleteUrl:'/api/document/vendor/delete/',
+    _batchOpenUrl:'/api/document/vendor/batchOpen',
+    _batchCloseUrl:'/api/document/vendor/batchClose',
+    _batchDeleteUrl:'/api/document/vendor/batchDelete',
 
     gridConfig: {
         idField: 'id',
         codeField: 've_code',
         statusCodeField:'ve_statuscode',
-        dataUrl: basePath+'document/vendor/list',
+        dataUrl: '/api/document/vendor/list',
         columns : [{
             text : "供应商id", 
             width : 0, 

frontend/saas-web/app/view/document/vendor/FormPanel.js

@@ -13,11 +13,11 @@ Ext.define('saas.view.document.vendor.FormPanel', {
     _codeField: 've_code',
     _statusField: 've_status',
     _statusCodeField: 've_statuscode',
-    _readUrl:basePath+'document/vendor/read/',
-    _saveUrl:basePath+'document/vendor/save',
-    _openUrl:basePath+'document/vendor/open',
-    _closeUrl:basePath+'document/vendor/close',
-    _deleteUrl:basePath+'document/vendor/delete/',
+    _readUrl:'/api/document/vendor/read/',
+    _saveUrl:'/api/document/vendor/save',
+    _openUrl:'/api/document/vendor/open',
+    _closeUrl:'/api/document/vendor/close',
+    _deleteUrl:'/api/document/vendor/delete/',
     initId:0,
 
     defaultItems: [{
@@ -52,7 +52,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         columnWidth: 0.25
     },{
         xtype : "remotecombo", 
-        storeUrl:basePath+'document/vendorkind/getCombo',
+        storeUrl:'/api/document/vendorkind/getCombo',
         name : "ve_type", 
         fieldLabel : "供应商类型", 
         allowBlank : true, 
@@ -64,8 +64,8 @@ Ext.define('saas.view.document.vendor.FormPanel', {
             vendorkind:{
                 keyField:'id',
                 dataField:'vk_name',
-                reqUrl:basePath+'document/vendorkind/save',
-                delUrl:basePath+'document/vendorkind/delete'
+                reqUrl:'/api/document/vendorkind/save',
+                delUrl:'/api/document/vendorkind/delete'
             }
         },
         addHandler:function(b){
@@ -149,7 +149,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn:  'vc_detno',
         storeModel:'saas.model.document.vendorcontact',
-        deleteDetailUrl:basePath+'document/vendor/deleteContact/',
+        deleteDetailUrl:'/api/document/vendor/deleteContact/',
         columns : [
             {
                 text : "ID", 

frontend/saas-web/app/view/main/Navigation.js

@@ -197,7 +197,7 @@ Ext.define('saas.view.main.Navigation', {
             menuId = 'navMenu-' + id,
             menu = Ext.getCmp(menuId);
 
-        if (cx <= itemBox.left || cy <= itemBox.top || cy >= (itemBox.top + itemBox.height)) {
+        if (cx <= itemBox.left || cy <= itemBox.top || (cy >= (itemBox.top + itemBox.height) && cx <= (itemBox.left + itemBox.width - 10))) {
             if (menu) {
                 menu.hide();
             }

frontend/saas-web/app/view/money/fundtransfer/FormPanel.js

@@ -15,9 +15,9 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
      _statusField: 'ft_status',
      _statusCodeField: 'ft_statuscode',
      _relationColumn: 'ftd_ftid',
-     _readUrl:basePath+'money/fundtransfer/read/',
-     _saveUrl:basePath+'money/fundtransfer/save',
-     _deleteUrl:basePath+'money/fundtransfer/delete/',
+     _readUrl:'/api/money/fundtransfer/read/',
+     _saveUrl:'/api/money/fundtransfer/save',
+     _deleteUrl:'/api/money/fundtransfer/delete/',
      initId:0,
 
     defaultItems: [{
@@ -34,7 +34,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
         xtype : "detailGridField", 
         storeModel:'saas.model.money.FundTransfer',
         detnoColumn:  'ftd_detno',
-        _deleteDetailUrl:basePath+'fundtransfer/deleteItem/',
+        deleteDetailUrl:'/api/money/fundtransfer/deleteItem/',
         columnWidth : 1,
         columns : [
             {
@@ -44,7 +44,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                 width:0
             }, {
                 text : "期间", 
-                dataIndex : "ftd_ym ", 
+                dataIndex : "ftd_ym", 
                 editor : {
                     xtype : "numberfield"
                 },
@@ -58,7 +58,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
             }, {
                 text : "转出账户编号", 
                 dataIndex : "ftd_bankcode", 
-                width : 0
+                width :0
             }, {
                 text : "转出账户", 
                 width : 200.0, 
@@ -85,7 +85,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
             }, {
                 text : "转入账户编号", 
                 dataIndex : "ftd_inbankcode", 
-                width : 0
+                width :0
             }, {
                 text : "转入账户", 
                 width : 200.0, 
@@ -119,7 +119,10 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
             }, {
                 text : "结算方式号", 
                 dataIndex : "ftd_paycode", 
-                width : 0
+                width : 100,
+                editor:{
+                    xtype: ''  
+                }
             }, {
                 text : "结算方式", 
                 width : 200.0, 
@@ -144,7 +147,6 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                 dataIndex : "ftd_remark",
                 width : 120.0, 
                 items : null,
-                ignore:true,
                 flex : 1.0,
                 editor : {
                     xtype : ""

frontend/saas-web/app/view/money/fundtransfer/FormPanelController.js

@@ -8,7 +8,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
             'dbfindtrigger[name=ftd_bankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/bankinformation/list',
+                        dataUrl:'/api/document/bankinformation/list',
                         dbfinds:[
                         {
                             from:'bk_bankcode',to:'ftd_bankcode'
@@ -53,7 +53,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
             'dbfindtrigger[name=ftd_inbankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/bankinformation/list',
+                        dataUrl:'/api/document/bankinformation/list',
                         dbfinds:[
                         {
                             from:'bk_bankcode',to:'ftd_inbankcode'

frontend/saas-web/app/view/money/fundtransfer/QueryPanel.js

@@ -8,78 +8,66 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
     viewName: 'money-fundtransfer-querypanel',
     
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'or_id',
-        fieldLabel: 'ID',
-        allowBlank: true,
-        columnWidth: 0
-    }, {
-        xtype : 'hidden',
-        name : 'or_custid', 
-        fieldLabel : '客户ID'
-   }, {
-        xtype: 'hidden',
-        name: 'or_custcode',
-        fieldLabel: '客户编号'
-    }, {
-        xtype: 'dbfindtrigger',
-        name: 'or_custname',
-        fieldLabel: '客户名称'
-    }, {
-        xtype : 'hidden',
-        name : 'or_bankid', 
-        fieldLabel : '账户ID'
-     }, {
-        xtype: 'hidden',
-        name: 'or_bankcode',
-        fieldLabel: '账户编号'
-    }, {
-        xtype: 'dbfindtrigger',
-        name: 'or_bankname',
-        fieldLabel: '账户名称'
+        format : "Y-m-d", 
+        xtype : "datefield", 
+        name : "ft_date", 
+        fieldLabel : "单据日期"
     }],
     moreQueryFormItems: [],
     queryGridConfig: {
-        idField: 'or_id',
-        codeField: 'or_code',
+        idField: 'id',
+        codeField: 'ft_code',
         addTitle: '其它收入单',
         addXtype: 'money-fundtransfer-formpanel',
         defaultCondition:'',
-        baseVastUrl: basePath+'money/fundtransfer/',
+        baseVastUrl: '/api/money/fundtransfer/',
         baseColumn: [{
             text: 'id',
-            dataIndex: 'or_id',
+            dataIndex: 'id',
             width: 0,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
-            dataIndex: 'or_code',
+            dataIndex: 'ft_code',
             width: 120
         }, {
             text: '单据状态',
-            dataIndex: 'or_status',
+            dataIndex: 'ft_status',
             width: 120
         }, {
             text: '录入人',
-            dataIndex: 'or_recorder',
+            dataIndex: 'ft_recorder',
             width: 120
         }, {
             text: '单据日期',
-            dataIndex: 'or_date',
+            dataIndex: 'ft_date',
             xtype: 'datecolumn',
             width: 200
         }, {
-            text: '客户名称',
-            dataIndex: 'or_custname',
+            text: '期间',
+            dataIndex: 'ftd_ym',
+            xtype : "numbercolumn", 
+            width: 120
+        }, {
+            text: '转出账户',
+            dataIndex: 'ftd_bankname',
+            width: 120
+        }, {
+            text: '转入账户',
+            dataIndex: 'ftd_inbankname',
             width: 120
         }, {
             text: '金额',
-            dataIndex: 'or_amount',
-            xtype: 'numbercolumn',
+            dataIndex: 'ftd_nowbalance',
+            xtype : "numbercolumn",
+            width: 120
+        }, {
+            text: '结算方式',
+            dataIndex: 'ftd_paymethod',
             width: 120
         }, {
             text: '备注',
-            dataIndex: 'or_remark',
+            dataIndex: 'ft_remark',
             width: 250,
             flex: 1
         }],

frontend/saas-web/app/view/money/othreceipts/FormPanel.js

@@ -15,9 +15,9 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
      _statusField: 'or_status',
      _statusCodeField: 'or_statuscode',
      _relationColumn: 'ord_orid',
-     _readUrl:basePath+'money/othreceipts/read/',
-     _saveUrl:basePath+'money/othreceipts/save',
-     _deleteUrl:basePath+'money/othreceipts/delete/', 
+     _readUrl:'/api/money/othreceipts/read/',
+     _saveUrl:'/api/money/othreceipts/save',
+     _deleteUrl:'/api/money/othreceipts/delete/',  
      initId:0,
 
     defaultItems: [{
@@ -53,7 +53,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
         xtype : "detailGridField", 
         storeModel:'saas.model.money.Othreceipts',
         detnoColumn:  'ord_detno',
-        deleteDetailUrl:basePath+'money/othreceipts/deleteDetail/',
+        deleteDetailUrl:'/api/money/othreceipts/deleteDetail/',
         columnWidth : 1,
         columns : [
             {
@@ -78,7 +78,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                 items : null,
                 editor : {
                     xtype : "remotecombo", 
-                    storeUrl:basePath+'document/fundinoutType/list',
+                    storeUrl:'/api/document/fundinoutType/list',
                     name : "ord_type", 
                     fieldLabel : "收入类别", 
                     allowBlank : true, 
@@ -90,8 +90,8 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                         inoutkind:{
                             keyField:'id',
                             dataField:'ft_name',
-                            reqUrl:basePath+'document/fundinoutType/save',
-                            delUrl:basePath+'document/fundinoutType/delete'
+                            reqUrl:'/api/document/fundinoutType/save',
+                            delUrl:'/api/document/fundinoutType/delete'
                         }
                     },
                     addHandler:function(b){
@@ -137,7 +137,6 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                 dataIndex : "ord_remark",
                 width : 120.0, 
                 items : null,
-                ignore:true,
                 flex : 1.0,
                 editor : {
                     xtype : ""

frontend/saas-web/app/view/money/othreceipts/FormPanelController.js

@@ -8,7 +8,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
             'dbfindtrigger[name=or_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/customer/list',
+                        dataUrl:'/api/document/customer/list',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
                         dbfinds:[{
@@ -55,7 +55,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
             'dbfindtrigger[name=or_bankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/bankinformation/list',
+                        dataUrl:'/api/document/bankinformation/list',
                         dbfinds:[{
                             from:'bk_bankcode',to:'or_bankcode'
                         },{

frontend/saas-web/app/view/money/othreceipts/QueryPanel.js

@@ -40,22 +40,21 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
     }],
     moreQueryFormItems: [],
     queryGridConfig: {
-        idField: 'or_id',
+        idField: 'id',
         codeField: 'or_code',
         addTitle: '其它收入单',
         addXtype: 'money-othreceipts-formpanel',
         defaultCondition:'',
-       // baseVastUrl: basePath+'money/othreceipts/',
-        baseVastUrl: 'http://192.168.253.129:8940/othreceipts/',
+        baseVastUrl: '/api/money/othreceipts/',
         baseColumn: [{
             text: 'id',
-            dataIndex: 'or_id',
-            width: 0,
+            dataIndex: 'id',
+            width: 100,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
             dataIndex: 'or_code',
-            width: 120
+            width: 150
         }, {
             text: '单据状态',
             dataIndex: 'or_status',

frontend/saas-web/app/view/money/othreceipts/QueryPanelController.js

@@ -8,7 +8,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
             'dbfindtrigger[name=or_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/customer/list',
+                        dataUrl:'/api/document/customer/list',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
                         dbfinds:[{
@@ -55,7 +55,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
             'dbfindtrigger[name=or_bankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/bankinformation/list',
+                        dataUrl:'/api/document/bankinformation/list',
                         dbfinds:[{
                             from:'bk_bankcode',to:'or_bankcode'
                         },{

frontend/saas-web/app/view/money/othspendings/FormPanel.js

@@ -15,9 +15,9 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
      _statusField: 'os_status',
      _statusCodeField: 'os_statuscode',
      _relationColumn: 'osd_orid',
-     _readUrl:basePath+'money/othspendings/read/',
-     _saveUrl:basePath+'money/othspendings/save',
-     _deleteUrl:basePath+'money/othspendings/delete/',
+     _readUrl:'/api/money/othspendings/read/',
+     _saveUrl:'/api/money/othspendings/save',
+     _deleteUrl:'/api/money/othspendings/delete/', 
      initId:0,
 
     defaultItems: [{
@@ -53,7 +53,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
         xtype : "detailGridField", 
         storeModel:'saas.model.money.Othspendings',
         detnoColumn:  'osd_detno',
-        deleteDetailUrl:basePath+'money/othspendings/deleteDetail/',
+        deleteDetailUrl:'/api/money/othspendings/deleteDetail/',
         columnWidth : 1,
         columns : [
             {
@@ -78,7 +78,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
                 items : null,
                 editor : {
                     xtype : "remotecombo", 
-                    storeUrl:basePath+'document/fundinoutType/list',
+                    storeUrl:'/api/document/fundinoutType/list',
                     name : "osd_type", 
                     fieldLabel : "支出类别", 
                     allowBlank : true, 
@@ -90,8 +90,8 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
                         inoutkind:{
                             keyField:'id',
                             dataField:'ft_name',
-                            reqUrl:basePath+'document/fundinoutType/save',
-                            delUrl:basePath+'document/fundinoutType/delete'
+                            reqUrl:'/api/document/fundinoutType/save',
+                            delUrl:'/api/document/fundinoutType/delete'
                         }
                     },
                     addHandler:function(b){
@@ -137,7 +137,9 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
                 dataIndex : "osd_remark",
                 width : 120.0, 
                 items : null,
-                ignore:true,
+                editor : {
+                    xtype : ""
+                },
                 flex : 1.0,
             }
         ]

frontend/saas-web/app/view/money/othspendings/FormPanelController.js

@@ -8,7 +8,7 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
             'dbfindtrigger[name=os_vendname]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: basePath + 'document/vendor/list',
+                        dataUrl: '/api/document/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
                         dbfinds: [{
@@ -62,7 +62,7 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
             'dbfindtrigger[name=os_bankname]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: basePath + 'document/bankinformation/list',
+                        dataUrl: '/api/document/bankinformation/list',
                         dbfinds: [{
                             from: 'bk_bankcode',
                             to: 'os_bankcode'

frontend/saas-web/app/view/money/othspendings/QueryPanel.js

@@ -40,16 +40,16 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
     }],
     moreQueryFormItems: [],
     queryGridConfig: {
-        idField: 'os_id',
+        idField: 'id',
         codeField: 'os_code',
         addTitle: '其它支出单',
         addXtype: 'money-othspendings-formpanel',
         defaultCondition:'',
-        baseVastUrl: basePath+'money/othspendings/',
+        baseVastUrl: '/api/money/othspendings/',
         baseColumn: [{
             text: 'id',
-            dataIndex: 'os_id',
-            width: 0,
+            dataIndex: 'id',
+            width: 100,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',

frontend/saas-web/app/view/money/othspendings/QueryPanelController.js

@@ -8,7 +8,7 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
             'dbfindtrigger[name=os_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/vendor/list',
+                        dataUrl:'/api/document/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
                         dbfinds:[{
@@ -58,7 +58,7 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'os_bankcode',
-                        dataUrl:basePath+'document/bankinformation/list',
+                        dataUrl:'/api/document/bankinformation/list',
                         dbfinds:[{
                             from:'bk_bankcode',to:'os_bankcode'
                         },{

frontend/saas-web/app/view/money/payBalance/FormPanel.js

@@ -15,10 +15,11 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
     _statusField: 'pb_status',
     _statusCodeField: 'pb_statuscode',
     
-    _readUrl: basePath + 'money/paybalance/read/',
-    _saveUrl: basePath + 'money/paybalance/save/',
-    _auditUrl: basePath + 'money/paybalance/audit/',
-    _deleteUrl: basePath + 'money/paybalance/delete/',
+    _readUrl: '/api/money/paybalance/read/',
+    _saveUrl: '/api/money/paybalance/save/',
+    _auditUrl: '/api/money/paybalance/audit/',
+    _unAuditUrl: 'api/money/paybalance/unAudit/',
+    _deleteUrl: '/api/money/paybalance/delete/',
 
     // _readUrl: 'http://192.168.253.129:8940/money/paybalance/read/',
     // _saveUrl: 'http://192.168.253.129:8940/money/paybalance/save/',
@@ -88,7 +89,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         xtype: "detailGridField",
         storeModel: 'saas.model.money.PayBalance1',
         detnoColumn: 'pb_detno',
-        deleteDetailUrl: basePath + 'money/paybalance/deleteDetail1/',
+        deleteDetailUrl: '/api/money/paybalance/deleteDetail1/',
         columns: [{
             text: 'ID',
             dataIndex: 'id',
@@ -122,7 +123,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         xtype: "detailGridField",
         storeModel: 'saas.model.money.PayBalance2',
         detnoColumn: 'pbd_detno',
-        deleteDetailUrl: basePath + 'money/paybalance/deleteDetail2/',
+        deleteDetailUrl: '/api/money/paybalance/deleteDetail2/',
         columns: [{
             text: 'ID',
             dataIndex: 'id',

frontend/saas-web/app/view/money/payBalance/FormPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl: basePath + 'document/customer/list',
+                        dataUrl: '/api/document/customer/list',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
                         //赋值 

frontend/saas-web/app/view/money/payBalance/QueryPanel.js

@@ -19,7 +19,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
         addTitle: '付款单',
         addXtype: 'money-paybalance-formpanel',
         defaultCondition:'',
-        baseVastUrl: basePath + 'money/paybalance/',
+        baseVastUrl: '/api/money/paybalance/',
         // baseVastUrl: 'http://192.168.253.129:8940/money/paybalance/',
         baseColumn: [{
             text: 'id',

frontend/saas-web/app/view/money/payBalance/QueryPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath + 'document/vendor/list',
+                        dataUrl:'/api/document/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
                         dbfinds:[{
@@ -63,7 +63,7 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath + 'document/product/list',
+                        dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[{

frontend/saas-web/app/view/money/recBalance/FormPanel.js

@@ -16,11 +16,11 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
     _statusField: 'rb_status',
     _statusCodeField: 'rb_statuscode',
     
-    _readUrl: basePath + 'money/recbalance/read/',
-    _saveUrl: basePath + 'money/recbalance/save/',
-    _auditUrl: basePath + 'money/recbalance/audit/',
-    _unAuditUrl: basePath + 'money/recbalance/unAudit/',
-    _deleteUrl: basePath + 'money/recbalance/delete/',
+    _readUrl: '/api/money/recbalance/read/',
+    _saveUrl: '/api/money/recbalance/save/',
+    _auditUrl: '/api/money/recbalance/audit/',
+    _unAuditUrl: '/api/money/recbalance/unAudit/',
+    _deleteUrl: '/api/money/recbalance/delete/',
     initId: 0,
 
     defaultItems: [{
@@ -81,7 +81,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         xtype: "detailGridField",
         storeModel: 'saas.model.money.RecBalance1',
         detnoColumn: 'rd_detno',
-        deleteDetailUrl: basePath + 'money/recbalance/deleteDetail1/',
+        deleteDetailUrl: '/api/money/recbalance/deleteDetail1/',
         columns: [{
             text: 'ID',
             dataIndex: 'id',
@@ -142,7 +142,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         xtype: "detailGridField",
         storeModel: 'saas.model.money.RecBalance2',
         detnoColumn: 'rbd_detno',
-        deleteDetailUrl: basePath + 'money/recbalance/deleteDetail2/',
+        deleteDetailUrl: '/api/money/recbalance/deleteDetail2/',
         columns: [{
             text: 'ID',
             dataIndex: 'id',

frontend/saas-web/app/view/money/recBalance/FormPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl: basePath + 'document/customer/list',
+                        dataUrl: '/api/document/customer/list',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
                         //赋值 
@@ -66,7 +66,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl: basePath + 'document/customer/list',
+                        dataUrl: '/api/document/customer/list',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
                         //赋值 

frontend/saas-web/app/view/money/recBalance/QueryPanel.js

@@ -33,7 +33,7 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
         addTitle: '收款单',
         addXtype: 'money-recbalance-formpanel',
         defaultCondition:'',
-        baseVastUrl: basePath + 'money/recbalance/',
+        baseVastUrl: '/api/money/recbalance/',
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',

frontend/saas-web/app/view/money/recBalance/QueryPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl: basePath + 'document/vendor/list',
+                        dataUrl: '/api/document/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
                         dbfinds:[{
@@ -63,7 +63,7 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl: basePath + 'document/product/list',
+                        dataUrl: '/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[{

frontend/saas-web/app/view/purchase/purchase/FormPanel.js

@@ -16,12 +16,20 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
      _statusCodeField: 'pu_statuscode',
      _relationColumn: 'pd_puid',
 
-     _readUrl:basePath+'purchase/purchase/read/',
-     _saveUrl:basePath+'purchase/purchase/save/',
-     _auditUrl:basePath+'purchase/purchase/audit/',
-     _unAuditUrl: basePath + 'purchase/purchase/unAudit/',
-     _deleteUrl:basePath+'purchase/purchase/delete/',
-     _turnInUrl:basePath+'purchase/prodinout/turnProdin/',
+     _readUrl:'/api/purchase/purchase/read/',
+     _saveUrl:'/api/purchase/purchase/save/',
+     _auditUrl:'/api/purchase/purchase/audit/',
+     _unAuditUrl: '/api/purchase/purchase/unAudit/',
+     _deleteUrl:'/api/purchase/purchase/delete/',
+     _turnInUrl:'/api/purchase/purchase/turnProdin/',
+
+    // _readUrl:'http://localhost:8800/purchase/read/',
+    // _saveUrl:'http://localhost:8800/purchase/save',
+    // _auditUrl:'http://localhost:8800/purchase/audit',
+    // _unAuditUrl: '/api/purchase/purchase/unAudit/',
+    // _deleteUrl:'http://localhost:8800/purchase/delete/',
+    // _turnInUrl:'http://localhost:8800/purchase/turnProdin/',
+
      initId:0,
  
      toolBtns: [{
@@ -79,7 +87,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         xtype : "detailGridField", 
         storeModel:'saas.model.purchase.ProdIODetail',
         detnoColumn:  'pd_detno',
-        deleteDetailUrl:basePath+'purchase/purchase/deleteDetail/',
+        deleteDetailUrl:'/api/purchase/purchase/deleteDetail/',
         columns : [
             {
                 text : "id", 

frontend/saas-web/app/view/purchase/purchase/FormPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:basePath+'document/vendor/list',
+                        dataUrl:'/api/document/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
                         //赋值 
@@ -79,7 +79,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl: basePath + 'document/product/list',
+                        dataUrl: '/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         //放大镜赋值设置

frontend/saas-web/app/view/purchase/purchase/QueryPanel.js

@@ -96,7 +96,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         addTitle: '采购单',
         addXtype: 'purchase-purchase-formpanel',
         defaultCondition:'',
-        baseVastUrl: basePath+'purchase/purchase/',
+        baseVastUrl: '/api/purchase/purchase/',
         baseColumn: [{
             text: 'id',
             dataIndex: 'pu_id',

frontend/saas-web/app/view/purchase/purchase/QueryPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
             'dbfindtrigger[name=pu_vendcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/vendor/list',
+                        dataUrl:'/api/document/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
                         dbfinds:[{
@@ -63,7 +63,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/list',
+                        dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[{

frontend/saas-web/app/view/purchase/purchaseIn/FormPanel.js

@@ -16,12 +16,12 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     _statusCodeField: 'pi_statuscode',
     
     _relationColumn: 'pd_piid',
-    _readUrl:basePath+'purchase/prodinout/read/',
-    _saveUrl:basePath+'purchase/prodinout/save',
-    _auditUrl:basePath+'purchase/prodinout/audit',
-    _deleteUrl:basePath+'purchase/prodinout/delete',
-    _baseVastUrl:basePath+'purchase/prodinout/',
-    _turnOutUrl:basePath+'purchase/prodinout/turnProdOut/',
+    _readUrl:'/api/purchase/prodinout/read/',
+    _saveUrl:'/api/purchase/prodinout/save',
+    _auditUrl:'/api/purchase/prodinout/audit',
+    _unAuditUrl:'/api/purchase/prodinout/unAudit/',
+    _deleteUrl:'/api/purchase/prodinout/delete/',
+    _turnOutUrl:'/api/purchase/prodinout/turnProdOut/',
 
     // _relationColumn: 'pd_piid',
     // _readUrl:'http://localhost:8800/prodinout/read/',
@@ -106,7 +106,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         xtype : "detailGridField",
         storeModel:'saas.model.document.ProductDTO',
         // deleteDetailUrl:'http://localhost:8800/prodinout/deleteDetail/',
-        deleteDetailUrl:basePath+'purchase/prodinout/deleteDetail/',
+        deleteDetailUrl:'api/purchase/prodinout/deleteDetail/',
         detnoColumn:  'pd_pdno',
         columns : [
             {

frontend/saas-web/app/view/purchase/purchaseIn/FormPanelController.js

@@ -16,7 +16,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
 
-                        dataUrl:basePath+'document/vendor/list',
+                        dataUrl:'/api/document/vendor/list',
                         // dataUrl:'http://localhost:9480/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
@@ -72,7 +72,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/product/list',
+                        dataUrl:'/api/document/product/list',
                         // dataUrl:'http://localhost:9480/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
@@ -136,7 +136,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
             'dbfindtrigger[name=pd_whname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/warehouse/list',
+                        dataUrl:'/api/document/warehouse/list',
                         // dataUrl:'http://localhost:9480/warehouse/list',
                         addXtype: 'other-warehouse',
                         addTitle: '仓库资料',

frontend/saas-web/app/view/purchase/purchaseIn/QueryPanel.js

@@ -107,7 +107,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         addTitle:'采购验收单',
         addXtype:'purchase-purchasein-formpanel',
         defaultCondition:' pi_class = \'采购验收单\'',
-        baseVastUrl:basePath+'purchase/prodinout/',
+        baseVastUrl:'/api/purchase/prodinout/',
         // baseVastUrl:"http://localhost:8800/prodinout/",
         baseColumn: [{
             text: 'id',

frontend/saas-web/app/view/purchase/purchaseIn/QueryPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/vendor/list',
+                        dataUrl:'/api/document/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
                         dbfinds:[{
@@ -63,7 +63,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/list',
+                        dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[{

frontend/saas-web/app/view/purchase/purchaseOut/FormPanel.js

@@ -16,11 +16,11 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
     _statusCodeField: 'pi_statuscode',
     
     _relationColumn: 'pd_piid',
-    _readUrl:basePath+'purchase/prodinout/read/',
-    _saveUrl:basePath+'purchase/prodinout/save',
-    _auditUrl:basePath+'purchase/prodinout/audit',
-    _unAuditUrl:basePath+'purchase/prodinout/unAudit',
-    _deleteUrl:basePath+'purchase/prodinout/delete/',
+    _readUrl:'/api/purchase/prodinout/read/',
+    _saveUrl:'/api/purchase/prodinout/save',
+    _auditUrl:'/api/purchase/prodinout/audit',
+    _unAuditUrl:'/api/purchase/prodinout/unAudit/',
+    _deleteUrl:'/api/purchase/prodinout/delete/',
 
     // _relationColumn: 'pd_piid',
     // _readUrl:'http://localhost:8800/prodinout/read/',
@@ -101,7 +101,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
         xtype : "detailGridField",
         storeModel:'saas.model.document.ProductDTO',
         // deleteDetailUrl:'http://localhost:8800/prodinout/deleteDetail/',
-        deleteDetailUrl:basePath+'purchase/prodinout/deleteDetail/',
+        deleteDetailUrl:'api/purchase/prodinout/deleteDetail/',
         detnoColumn:  'pd_pdno',
         columns : [
             {

frontend/saas-web/app/view/purchase/purchaseOut/FormPanelController.js

@@ -15,7 +15,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
             'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/vendor/list',
+                        dataUrl:'/api/document/vendor/list',
                         // dataUrl:'http://localhost:9480/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
@@ -71,7 +71,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/product/list',
+                        dataUrl:'/api/document/product/list',
                         // dataUrl:'http://localhost:9480/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
@@ -135,7 +135,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
             'dbfindtrigger[name=pd_whname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/warehouse/list',
+                        dataUrl:'/api/document/warehouse/list',
                         // dataUrl:'http://localhost:9480/warehouse/list',
                         addXtype: 'other-warehouse',
                         addTitle: '仓库资料',

frontend/saas-web/app/view/purchase/purchaseOut/QueryPanel.js

@@ -107,7 +107,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         addTitle:'采购验退单',
         addXtype:'purchase-purchaseout-formpanel',
         defaultCondition:' pi_class = \'采购验退单\'',
-        baseVastUrl:basePath+'purchase/prodinout/',
+        baseVastUrl:'/api/purchase/prodinout/',
         // baseVastUrl:"http://localhost:8800/prodinout/",
         baseColumn: [{
             text: 'id',

frontend/saas-web/app/view/purchase/purchaseOut/QueryPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/vendor/list',
+                        dataUrl:'/api/document/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
                         dbfinds:[{
@@ -63,7 +63,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/list',
+                        dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[{

frontend/saas-web/app/view/sale/sale/FormPanel.js

@@ -16,12 +16,12 @@ Ext.define('saas.view.sale.sale.FormPanel', {
      _statusCodeField: 'sa_statuscode',
      
      _relationColumn: 'sd_puid',
-     _readUrl:basePath+'sale/sale/read/',
-     _saveUrl:basePath+'sale/sale/save',
-     _auditUrl:basePath+'sale/sale/audit',
-     _unAuditUrl: basePath + 'sale/sale/unAudit/',
-     _deleteUrl:basePath+'sale/sale/delete/',
-     _turnOutUrl:basePath+'sale/sale/turnProdOut/', 
+     _readUrl:'/api/sale/sale/read/',
+     _saveUrl:'/api/sale/sale/save',
+     _auditUrl:'/api/sale/sale/audit',
+     _unAuditUrl: '/api/sale/sale/unAudit/',
+     _deleteUrl:'/api/sale/sale/delete/',
+     _turnOutUrl:'/api/sale/sale/turnProdOut/', 
      initId:0,
  
      toolBtns: [{
@@ -57,7 +57,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn: 'sd_detno',
         storeModel:'saas.model.sale.Saledetail',
-        deleteDetailUrl:basePath+'sale/sale/deleteDetail/',
+        deleteDetailUrl:'/api/sale/sale/deleteDetail/',
         columns : [
            {
                 text : "id", 
@@ -124,8 +124,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 dataIndex : "sd_price", 
                 width : 120.0, 
                 xtype : "numbercolumn",
-                items : null,
-                summaryType: 'sum'
+                items : null
             }, 
             {
                 text : "税率", 

frontend/saas-web/app/view/sale/sale/FormPanelController.js

@@ -8,7 +8,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
             'dbfindtrigger[name=sa_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/customer/list',
+                        dataUrl:'/api/document/customer/list',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
                         dbfinds:[{
@@ -63,7 +63,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
             'dbfindtrigger[name=sd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/product/list',
+                        dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[

frontend/saas-web/app/view/sale/sale/QueryPanel.js

@@ -73,18 +73,26 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         addTitle: '销售订单',
         addXtype: 'sale-sale-formpanel',
         defaultCondition:'',
-        baseVastUrl: basePath+'sale/sale/',
+        baseVastUrl: '/api/sale/sale/',
         baseColumn: [{
             text: 'id',
             dataIndex: 'sa_id',
             width: 0,
             xtype: 'numbercolumn'
         }, {
-            text: '单据编号',
+            text: '销售单号',
             dataIndex: 'sa_code',
             width: 120
         }, {
-            text: '单据状态',
+            text: '客户编号',
+            dataIndex: 'sa_cucode',
+            width: 120
+        }, {
+            text: '客户名称',
+            dataIndex: 'sa_cuname',
+            width: 120
+        }, {
+            text: '业务状态',
             dataIndex: 'sa_status',
             width: 120
         }, {
@@ -92,16 +100,25 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             dataIndex: 'sa_recorddate',
             xtype: 'datecolumn',
             width: 200
-        }, {
-            text: '客户名称',
-            dataIndex: 'sa_cuname',
-            width: 120
         }, {
             text: '金额',
             dataIndex: 'sa_total',
             xtype: 'numbercolumn',
             width: 120
-        }],
+        }, {
+            text: '制单人',
+            dataIndex: 'sa_recorder',
+            width: 120
+        }, {
+            text: '审核人',
+            dataIndex: 'sa_auditman',
+            width: 120
+        }, {
+            text: '收货地址',
+            dataIndex: 'sa_toplace',
+            width: 120
+        }
+    ],
         relativeColumn: [ {
             text: 'id',
             dataIndex: 'sa_id',

frontend/saas-web/app/view/sale/sale/QueryPanelController.js

@@ -8,7 +8,7 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
             'dbfindtrigger[name=sa_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/customer/list',
+                        dataUrl:'/api/document/customer/list',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
                         dbfinds:[{
@@ -63,7 +63,7 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
             'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/product/list',
+                        dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[{

frontend/saas-web/app/view/sale/saleIn/FormPanel.js

@@ -16,12 +16,12 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
     _statusCodeField: 'pi_statuscode',
     
     _relationColumn: 'pd_piid',
-    _readUrl:basePath+'sale/prodinout/read/',
-    _saveUrl:basePath+'sale/prodinout/save',
-    _auditUrl:basePath+'sale/prodinout/audit',
-    _unAuditUrl: basePath + 'sale/prodinout/unAudit',
-    _deleteUrl:basePath+'sale/prodinout/delete/',
-    _turnInUrl:basePath+'sale/prodinout/turnProdIn/',
+    _readUrl:'/api/sale/prodinout/read/',
+    _saveUrl:'/api/sale/prodinout/save',
+    _auditUrl:'/api/sale/prodinout/audit',
+    _unAuditUrl: '/api/sale/prodinout/unAudit',
+    _deleteUrl:'/api/sale/prodinout/delete/',
+    _turnInUrl:'/api/sale/prodinout/turnProdIn/',
     initId:0,
 
     defaultItems: [{
@@ -53,7 +53,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn:  'pd_pdno',
         storeModel:'saas.model.sale.ProdIODetail',
-        deleteDetailUrl:basePath+'prodinout/deleteDetail/',
+        deleteDetailUrl:'/api/prodinout/deleteDetail/',
         columns : [
             {
                 text : "id", 

frontend/saas-web/app/view/sale/saleIn/FormPanelController.js

@@ -8,7 +8,7 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
             'dbfindtrigger[name=pi_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/customer/list',
+                        dataUrl:'/api/document/customer/list',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
                         dbfinds:[
@@ -64,7 +64,7 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/product/list',
+                        dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[
@@ -125,8 +125,8 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
             'dbfindtrigger[name=pd_whname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/warehouse/list',
-                        addXtype: 'other-warehouse',
+                        dataUrl:'/api/document/warehouse/list',
+                        addXtype: 'other-storeinformation',
                         addTitle: '仓库资料',
                         dbfinds:[{
                             from:'id',to:'pd_whid',

frontend/saas-web/app/view/sale/saleIn/QueryPanel.js

@@ -68,7 +68,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         addTitle:'销售退货单',
         addXtype:'sale-salein-formpanel',
         defaultCondition:' pi_class = \'销售退货单\'',
-        baseVastUrl: basePath+'sale/prodinout/',
+        baseVastUrl: '/api/sale/prodinout/',
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',

frontend/saas-web/app/view/sale/saleIn/QueryPanelController.js

@@ -8,7 +8,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
             'dbfindtrigger[name=pi_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/customer/list',
+                        dataUrl:'/api/document/customer/list',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
                         dbfinds:[
@@ -67,7 +67,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/product/list',
+                        dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[{

frontend/saas-web/app/view/sale/saleOut/FormPanel.js

@@ -16,11 +16,11 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
     _statusCodeField: 'pi_statuscode',
     
     _relationColumn: 'pd_piid',
-    _readUrl:basePath+'sale/prodinout/read/',
-    _saveUrl:basePath+'sale/prodinout/save',
-    _auditUrl:basePath+'sale/prodinout/audit',
-    _deleteUrl:basePath+'sale/prodinout/delete/',
-    _turnInUrl:basePath+'sale/prodinout/turnProdIn/',
+    _readUrl:'/api/sale/prodinout/read/',
+    _saveUrl:'/api/sale/prodinout/save',
+    _auditUrl:'/api/sale/prodinout/audit',
+    _deleteUrl:'/api/sale/prodinout/delete/',
+    _turnInUrl:'/api/sale/prodinout/turnProdIn/',
     initId:0,
 
     toolBtns: [{
@@ -62,7 +62,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn:  'pd_pdno',
         storeModel:'saas.model.sale.ProdIODetail',
-        deleteDetailUrl:basePath+'sale/prodinout/deleteDetail/',
+        deleteDetailUrl:'/api/sale/prodinout/deleteDetail/',
         columns : [
             {
                 text : "id", 

frontend/saas-web/app/view/sale/saleOut/FormPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
             'dbfindtrigger[name=pi_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/customer/list',
+                        dataUrl:'/api/document/customer/list',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
                         dbfinds:[
@@ -66,7 +66,7 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/list',
+                        dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[
@@ -128,8 +128,8 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'wh_code',
-                        dataUrl:basePath+'document/warehouse/list',
-                        addXtype: 'other-warehouse',
+                        dataUrl:'/api/document/warehouse/list',
+                        addXtype: 'other-storeinformation',
                         addTitle: '仓库资料',
                         dbfinds:[{
                             from:'id',to:'pd_whid',

frontend/saas-web/app/view/sale/saleOut/QueryPanel.js

@@ -69,7 +69,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         addTitle:'销售出货单',
         addXtype:'sale-saleout-formpanel',
         defaultCondition:' pi_class = \'销售出货单\'',
-        baseVastUrl: basePath+'sale/prodinout/',
+        baseVastUrl: '/api/sale/prodinout/',
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',

frontend/saas-web/app/view/sale/saleOut/QueryPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
             'dbfindtrigger[name=pi_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/customer/list',
+                        dataUrl:'/api/document/customer/list',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
                         dbfinds:[
@@ -67,7 +67,7 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/list',
+                        dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[{

frontend/saas-web/app/view/stock/appropriationInOut/FormPanel.js

@@ -16,10 +16,11 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
     _statusCodeField: 'pi_statuscode',
     
     _relationColumn: 'pd_piid',
-    _readUrl:basePath+'storage/prodinout/read/',
-    _saveUrl:basePath+'storage/prodinout/save',
-    _auditUrl:basePath+'storage/prodinout/audit',
-    _deleteUrl:basePath+'storage/prodinout/delete',
+    _readUrl:'/api/storage/prodinout/read/',
+    _saveUrl:'/api/storage/prodinout/save',
+    _auditUrl:'/api/storage/prodinout/audit',
+    _unAuditUrl: '/api/storage/prodinout/unAudit/',
+    _deleteUrl:'/api/storage/prodinout/delete/',
 
 
     // _relationColumn: 'pd_piid',
@@ -104,7 +105,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
         xtype : "detailGridField",
         storeModel:'saas.model.document.ProductDTO',
         // deleteDetailUrl:'http://localhost:9000/prodinout/deleteDetail/',
-        deleteDetailUrl:basePath+'storage/prodinout/deleteDetail/',
+        deleteDetailUrl:'/api/storage/prodinout/deleteDetail/',
         detnoColumn:  'pd_pdno',
         columns : [
             {

frontend/saas-web/app/view/stock/appropriationInOut/FormPanelController.js

@@ -15,7 +15,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
             'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/vendor/list',
+                        dataUrl:'/api/document/vendor/list',
                         // dataUrl:'http://localhost:9480/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
@@ -72,7 +72,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
 
-                        dataUrl:basePath+'document/customer/list',
+                        dataUrl:'/api/document/customer/list',
                         // dataUrl:'http://localhost:9480/customer/list',
                         dbfinds:[{
                             from:'id',to:'pi_custid'
@@ -118,7 +118,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/product/list',
+                        dataUrl:'/api/document/product/list',
                         // dataUrl:'http://localhost:9480/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
@@ -181,7 +181,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
            'dbfindtrigger[name=pd_whname]':{
             beforerender:function(f){
                 Ext.apply(f,{
-                    dataUrl:basePath+'document/warehouse/list',
+                    dataUrl:'/api/document/warehouse/list',
                     // dataUrl:'http://localhost:9480/warehouse/list',
                     addXtype: 'other-warehouse',
                         addTitle: '仓库资料',
@@ -226,7 +226,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
         'dbfindtrigger[name=pd_inwhname]':{
          beforerender:function(f){
              Ext.apply(f,{
-                 dataUrl:basePath+'document/warehouse/list',
+                 dataUrl:'/api/document/warehouse/list',
                 //  dataUrl:'http://localhost:9480/warehouse/list',
                 addXtype: 'other-warehouse',
                         addTitle: '仓库资料',
@@ -271,7 +271,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
             'dbfindtrigger[name=pd_inwhname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/warehouse/list',
+                        dataUrl:'/api/document/warehouse/list',
                         // dataUrl:'http://localhost:9480/warehouse/list',
                         dbfinds:[{
                             from:'id',to:'pd_inwhid'                          

frontend/saas-web/app/view/stock/appropriationInOut/QueryPanel.js

@@ -107,7 +107,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
         addTitle:'调拨单',
         addXtype:'stock-appropriationinout-formpanel',
         defaultCondition:' pi_class = \'调拨单\'',
-        baseVastUrl:basePath+'storage/prodinout/',
+        baseVastUrl:'/api/storage/prodinout/',
         // baseVastUrl:"http://localhost:9000/prodinout/",
         baseColumn: [{
             text: 'id',

frontend/saas-web/app/view/stock/appropriationInOut/QueryPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath + 'document/vendor/list',
+                        dataUrl:'/api/document/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
                         dbfinds:[{
@@ -62,7 +62,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath + 'document/product/list',
+                        dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[{

frontend/saas-web/app/view/stock/make/FormPanel.js

@@ -16,11 +16,11 @@ Ext.define('saas.view.stock.make.FormPanel', {
      _statusCodeField: 'ma_statuscode',
      _relationColumn: 'mm_maid',
 
-     _readUrl:basePath+'purchase/purchase/read/',
-     _saveUrl:basePath+'purchase/purchase/save',
-     _auditUrl:basePath+'purchase/purchase/audit',
-     _deleteUrl:basePath+'purchase/purchase/delete/',
-     _turnInUrl:basePath+'purchase/prodinout/turnProdin/',
+     _readUrl:'/api/purchase/purchase/read/',
+     _saveUrl:'/api/purchase/purchase/save',
+     _auditUrl:'/api/purchase/purchase/audit',
+     _deleteUrl:'/api/purchase/purchase/delete/',
+     _turnInUrl:'/api/purchase/prodinout/turnProdin/',
      initId:0,
  
      toolBtns: [],
@@ -91,7 +91,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
         xtype : "detailGridField", 
         storeModel:'saas.model.document.Product',
         detnoColumn:  'pd_detno',
-        deleteDetailUrl:basePath+'purchase/purchase/deleteDetail/',
+        deleteDetailUrl:'/api/purchase/purchase/deleteDetail/',
         columns : [
             {
                 text : "id", 

frontend/saas-web/app/view/stock/make/FormPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:basePath+'document/vendor/list',
+                        dataUrl:'/api/document/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
                         //赋值 
@@ -72,7 +72,7 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:basePath+'document/product/list',
+                        dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         //放大镜赋值设置

frontend/saas-web/app/view/stock/make/QueryPanel.js

@@ -104,7 +104,7 @@ Ext.define('saas.view.stock.make.QueryPanel', {
         addTitle: '采购单',
         addXtype: 'purchase-purchase-formpanel',
         defaultCondition:'',
-        baseVastUrl: basePath+'purchase/purchase/',
+        baseVastUrl: '/api/purchase/purchase/',
         baseColumn: [{
             text: 'id',
             dataIndex: 'pu_id',

frontend/saas-web/app/view/stock/make/QueryPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/vendor/list',
+                        dataUrl:'/api/document/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
                         dbfinds:[{
@@ -63,7 +63,7 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/list',
+                        dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[{

frontend/saas-web/app/view/stock/otherIn/FormPanel.js

@@ -17,11 +17,11 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
     _statusCodeField: 'pi_statuscode',
     
     _relationColumn: 'pd_piid',
-    _readUrl:basePath+'storage/prodinout/read/',
-    _saveUrl:basePath+'storage/prodinout/save',
-    _auditUrl:basePath+'storage/prodinout/audit',
-    _unAuditUrl: basePath + 'storage/prodinout/unAudit',
-    _deleteUrl:basePath+'storage/prodinout/delete',
+    _readUrl:'/api/storage/prodinout/read/',
+    _saveUrl:'/api/storage/prodinout/save',
+    _auditUrl:'/api/storage/prodinout/audit',
+    _unAuditUrl: '/api/storage/prodinout/unAudit/',
+    _deleteUrl:'/api/storage/prodinout/delete/',
 
     // _relationColumn: 'pd_piid',
     // _readUrl:'http://localhost:9000/prodinout/read/',
@@ -103,7 +103,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
         xtype : "detailGridField",
         storeModel:'saas.model.document.ProductDTO',
         // deleteDetailUrl:'http://localhost:9000/prodinout/deleteDetail/',
-        deleteDetailUrl:basePath+'storage/prodinout/deleteDetail/',
+        deleteDetailUrl:'/api/storage/prodinout/deleteDetail/',
         detnoColumn:  'pd_pdno',
         columns : [
             {

frontend/saas-web/app/view/stock/otherIn/FormPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
             'dbfindtrigger[name=pu_vendcode]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: basePath + 'document/vendor/list',
+                        dataUrl: '/api/document/vendor/list',
                         // dataUrl:'http://localhost:9480/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
@@ -70,7 +70,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                 beforerender: function (f) {
                     Ext.apply(f, {
 
-                        dataUrl: basePath + 'document/vendor/list',
+                        dataUrl: '/api/document/vendor/list',
                         // dataUrl:'http://localhost:9480/customer/list',
                         dbfinds: [{
                             from: 'id',
@@ -121,7 +121,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
             'dbfindtrigger[name=pd_prodcode]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: basePath + 'document/product/list',
+                        dataUrl: '/api/document/product/list',
                         // dataUrl:'http://localhost:9480/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
@@ -191,7 +191,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
             'dbfindtrigger[name=pd_whname]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: basePath + 'document/warehouse/list',
+                        dataUrl: '/api/document/warehouse/list',
                         // dataUrl:'http://localhost:9480/warehouse/list',
                         addXtype: 'other-warehouse',
                         addTitle: '仓库资料',

frontend/saas-web/app/view/stock/otherIn/QueryPanel.js

@@ -107,7 +107,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         addTitle:'其它入库单',
         addXtype:'stock-otherin-formpanel',
         defaultCondition:' pi_class = \'其它入库单\'',
-        baseVastUrl:basePath+'storage/prodinout/',
+        baseVastUrl:'/api/storage/prodinout/',
         // baseVastUrl:"http://localhost:9000/prodinout/",
         baseColumn: [{
             text: 'id',

frontend/saas-web/app/view/stock/otherIn/QueryPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath + 'document/vendor/list',
+                        dataUrl:'/api/document/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
                         dbfinds:[{
@@ -63,7 +63,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath + 'document/product/list',
+                        dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[{

frontend/saas-web/app/view/stock/otherOut/FormPanel.js

@@ -16,11 +16,11 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
     _statusCodeField: 'pi_statuscode',
 
     _relationColumn: 'pd_piid',
-    _readUrl: basePath + 'storage/prodinout/read/',
-    _saveUrl: basePath + 'storage/prodinout/save',
-    _auditUrl: basePath + 'storage/prodinout/audit',
-    _unAuditUrl: basePath + 'storage/prodinout/unAudit',
-    _deleteUrl: basePath + 'storage/prodinout/delete',
+    _readUrl: '/api/storage/prodinout/read/',
+    _saveUrl: '/api/storage/prodinout/save',
+    _auditUrl: '/api/storage/prodinout/audit',
+    _unAuditUrl: '/api/storage/prodinout/unAudit/',
+    _deleteUrl: '/api/storage/prodinout/delete/',
 
     // _relationColumn: 'pd_piid',
     // _readUrl:'http://localhost:9000/prodinout/read/',
@@ -101,7 +101,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
         xtype: "detailGridField",
         storeModel: 'saas.model.document.ProductDTO',
         // _deleteDetailUrl:'http://localhost:9000/prodinout/deleteDetail/',
-        deleteDetailUrl: basePath + 'storage/prodinout/deleteDetail/',
+        deleteDetailUrl: '/api/storage/prodinout/deleteDetail/',
         detnoColumn: 'pd_pdno',
         columns: [{
                 text: "id",

frontend/saas-web/app/view/stock/otherOut/FormPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
             'dbfindtrigger[name=pu_vendcode]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: basePath + 'document/vendor/list',
+                        dataUrl: '/api/document/vendor/list',
                         // dataUrl:'http://localhost:9480/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
@@ -71,7 +71,7 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
 
-                        dataUrl:basePath+'document/vendor/list',
+                        dataUrl:'/api/document/vendor/list',
                         // dataUrl:'http://localhost:9480/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
@@ -128,7 +128,7 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
 
-                        dataUrl:basePath+'document/customer/list',
+                        dataUrl:'/api/document/customer/list',
                         // dataUrl:'http://localhost:9480/customer/list',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
@@ -176,7 +176,7 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/product/list',
+                        dataUrl:'/api/document/product/list',
                         // dataUrl:'http://localhost:9480/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
@@ -240,7 +240,7 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
             'dbfindtrigger[name=pd_whname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/warehouse/list',
+                        dataUrl:'/api/document/warehouse/list',
                         // dataUrl:'http://localhost:9480/warehouse/list',
                         dbfinds:[{
                             from:'id',to:'pd_whid'                          

frontend/saas-web/app/view/stock/otherOut/QueryPanel.js

@@ -107,7 +107,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
         addTitle:'其它出库单',
         addXtype:'stock-otherout-formpanel',
         defaultCondition:' pi_class = \'其它出库单\'',
-        baseVastUrl:basePath+'storage/prodinout/',
+        baseVastUrl:'/api/storage/prodinout/',
         // baseVastUrl:"http://localhost:9000/prodinout/",
         baseColumn: [{
             text: 'id',

frontend/saas-web/app/view/stock/otherOut/QueryPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath + 'document/vendor/list',
+                        dataUrl:'/api/document/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
                         dbfinds:[{
@@ -62,7 +62,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath + 'document/product/list',
+                        dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[{

frontend/saas-web/overrides/data/Connection.js

@@ -0,0 +1,32 @@
+/**
+ * 在 ajax request 前修改url，增加服务端`basePath`
+ * `basePath`在`app.json`配置
+ */
+Ext.define('saas.override.data.Connection', {
+    override: 'Ext.data.Connection',
+ 
+    urlRegexp: /(http|ftp|https):\/\//,
+
+    privates: {
+        setupServerOptions: function(options) {
+            var serverOptions = Ext.manifest.server, originUrl = options.url;
+            if (serverOptions && serverOptions.basePath && !this.urlRegexp.test(originUrl) &&
+              (!serverOptions.urlPattern || new RegExp(serverOptions.urlPattern).test(originUrl))) {
+                Ext.apply(options, {
+                    url: serverOptions.basePath + (originUrl.indexOf('/') == 0 ? '' : '/') + originUrl,
+                    headers: {
+                        'Authorization': ' '
+                    }
+                });
+            }
+        }
+    },
+
+    request: function(options) {
+        if (options && options.url) {
+            this.setupServerOptions(options);
+        }
+        return this.callParent([options]);
+    }
+ });
+ 

frontend/saas-web/overrides/i18n.js

@@ -1,5 +1,3 @@
-var basePath = 'http://192.168.0.181:8560/api/';
-
 /**
  * 打开/切换到新页签
  * @param xtype: view xtype