merge

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/BomController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.print.Doc;
 
+@CrossOrigin
 @RestController
 @RequestMapping("/bom")
 public class BomController {

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/BomMapper.java

@@ -4,6 +4,8 @@ import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.document.entities.Bom;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface BomMapper extends CommonBaseMapper<Bom> {
     int deleteByPrimaryKey(Long bo_id);
 
@@ -22,4 +24,6 @@ public interface BomMapper extends CommonBaseMapper<Bom> {
     int validateCodeWhenInsert(@Param("code") String code, @Param("companyId") Long companyId);
 
     int validateCodeWhenUpdate(@Param("code") String code, @Param("id") Long id, @Param("companyId") Long company);
+
+    List<Bom> getListData(@Param("condition") String condition, @Param("companyId") Long companyId);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/BomService.java

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.document.service;
 
+import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseService;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
@@ -38,7 +39,7 @@ public interface BomService extends CommonBaseService<BomMapper, Bom> {
      * @param listReqDTO    条件对象
      * @return
      */
-    List<BomList> getListDataByCondition(PageRequest pageRequest, ListReqDTO listReqDTO);
+    PageInfo<Bom> getListDataByCondition(PageRequest pageRequest, ListReqDTO listReqDTO);
 
     /**
      * 通过ID获取主从表数据

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/BomServiceImpl.java

@@ -1,5 +1,7 @@
 package com.usoftchina.saas.document.service.impl;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
@@ -20,6 +22,7 @@ import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -36,6 +39,7 @@ public class BomServiceImpl extends CommonBaseServiceImpl<BomMapper, Bom> implem
     private MessageLogService messageLogService;
 
     @Override
+    @Transactional
     public DocBaseDTO saveData(BomList bomList) {
         Long id = bomList.getMain().getId();
         Long companyId = BaseContextHolder.getCompanyId();
@@ -117,8 +121,28 @@ public class BomServiceImpl extends CommonBaseServiceImpl<BomMapper, Bom> implem
     }
 
     @Override
-    public List<BomList> getListDataByCondition(PageRequest pageRequest, ListReqDTO listReqDTO) {
-        return null;
+    public PageInfo<Bom> getListDataByCondition(PageRequest page, ListReqDTO listReqDTO) {
+        //设置分页
+        if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
+            page = new PageRequest();
+            page.setNumber(1);
+            page.setSize(10);
+        }
+        PageHelper.startPage(page.getNumber(), page.getSize());
+        List<Bom> bomList = getList(listReqDTO);
+        //取分页信息
+        PageInfo<Bom> pageInfo = new PageInfo<Bom>(bomList);
+        return pageInfo;
+    }
+
+    private List<Bom> getList(ListReqDTO listReqDTO) {
+        Long companyId = BaseContextHolder.getCompanyId();
+        String condition = listReqDTO.getFinalCondition();
+        if(condition == null){
+            condition = "1=1";
+        }
+        List<Bom> bomList = getMapper().getListData(condition, companyId);
+        return bomList;
     }
 
     @Override

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

@@ -11,7 +11,7 @@
     <result column="bd_baseqty" property="bd_baseqty" jdbcType="INTEGER" />
     <result column="bd_replace" property="bd_replace" jdbcType="VARCHAR" />
     <result column="bd_remark" property="bd_remark" jdbcType="VARCHAR" />
-    <result column="comapnyId" property="companyId" jdbcType="INTEGER" />
+    <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
     <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
     <result column="bd_text1" property="bd_text1" jdbcType="VARCHAR" />
@@ -22,7 +22,7 @@
   </resultMap>
   <sql id="Base_Column_List" >
     bd_id, bd_bomid, bd_detno, bd_sonid, bd_soncode, bd_unit, bd_baseqty, bd_replace, 
-    bd_remark, comapnyId, updaterId, updateTime, bd_text1, bd_text2, bd_text3, bd_text4, 
+    bd_remark, companyId, updaterId, updateTime, bd_text1, bd_text2, bd_text3, bd_text4, 
     bd_text5
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
@@ -39,13 +39,13 @@
     insert into bomdetail (bd_bomid, bd_detno,
       bd_sonid, bd_soncode, bd_unit, 
       bd_baseqty, bd_replace, bd_remark, 
-      comapnyId, updaterId, updateTime, 
+      companyId, updaterId, updateTime, 
       bd_text1, bd_text2, bd_text3, 
       bd_text4, bd_text5)
     values ( #{bd_bomid,jdbcType=INTEGER}, #{bd_detno,jdbcType=INTEGER},
       #{bd_sonid,jdbcType=INTEGER}, #{bd_soncode,jdbcType=VARCHAR}, #{bd_unit,jdbcType=VARCHAR}, 
       #{bd_baseqty,jdbcType=INTEGER}, #{bd_replace,jdbcType=VARCHAR}, #{bd_remark,jdbcType=VARCHAR}, 
-      #{comapnyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{bd_text1,jdbcType=VARCHAR}, #{bd_text2,jdbcType=VARCHAR}, #{bd_text3,jdbcType=VARCHAR}, 
       #{bd_text4,jdbcType=VARCHAR}, #{bd_text5,jdbcType=VARCHAR})
   </insert>
@@ -76,8 +76,8 @@
       <if test="bd_remark != null" >
         bd_remark,
       </if>
-      <if test="comapnyId != null" >
-        comapnyId,
+      <if test="companyId != null" >
+        companyId,
       </if>
       <if test="updaterId != null" >
         updaterId,
@@ -126,8 +126,8 @@
       <if test="bd_remark != null" >
         #{bd_remark,jdbcType=VARCHAR},
       </if>
-      <if test="comapnyId != null" >
-        #{comapnyId,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null" >
         #{updaterId,jdbcType=INTEGER},
@@ -179,8 +179,8 @@
       <if test="bd_remark != null" >
         bd_remark = #{bd_remark,jdbcType=VARCHAR},
       </if>
-      <if test="comapnyId != null" >
-        comapnyId = #{comapnyId,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        companyId = #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
@@ -216,7 +216,7 @@
       bd_baseqty = #{bd_baseqty,jdbcType=INTEGER},
       bd_replace = #{bd_replace,jdbcType=VARCHAR},
       bd_remark = #{bd_remark,jdbcType=VARCHAR},
-      comapnyId = #{comapnyId,jdbcType=INTEGER},
+      companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updateTime = #{updateTime,jdbcType=TIMESTAMP},
       bd_text1 = #{bd_text1,jdbcType=VARCHAR},
@@ -227,108 +227,22 @@
     where bd_id = #{id}
   </update>
   <insert id="batchInsert" parameterType="java.util.List">
+    INSERT INTO BOMDETAIL (bd_bomid, bd_detno,
+    bd_sonid, bd_soncode, bd_unit,
+    bd_baseqty, bd_replace, bd_remark,
+    companyId, updaterId, updateTime,
+    bd_text1, bd_text2, bd_text3,
+    bd_text4, bd_text5)
+    values
     <foreach collection="list" item="item" index="index" open="" close="" separator=",">
-      INSERT INTO BOMDETAIL
-      <trim prefix="(" suffix=")" suffixOverrides=",">
-        <if test="item.bd_bomid != null" >
-          bd_bomid,
-        </if>
-        <if test="item.bd_detno != null" >
-          bd_detno,
-        </if>
-        <if test="item.bd_sonid != null" >
-          bd_sonid,
-        </if>
-        <if test="item.bd_soncode != null" >
-          bd_soncode,
-        </if>
-        <if test="item.bd_unit != null" >
-          bd_unit,
-        </if>
-        <if test="item.bd_baseqty != null" >
-          bd_baseqty,
-        </if>
-        <if test="item.bd_replace != null" >
-          bd_replace,
-        </if>
-        <if test="item.bd_remark != null" >
-          bd_remark,
-        </if>
-        <if test="item.comapnyId != null" >
-          comapnyId,
-        </if>
-        <if test="item.updaterId != null" >
-          updaterId,
-        </if>
-        <if test="item.updateTime != null" >
-          updateTime,
-        </if>
-        <if test="item.bd_text1 != null" >
-          bd_text1,
-        </if>
-        <if test="item.bd_text2 != null" >
-          bd_text2,
-        </if>
-        <if test="item.bd_text3 != null" >
-          bd_text3,
-        </if>
-        <if test="item.bd_text4 != null" >
-          bd_text4,
-        </if>
-        <if test="item.bd_text5 != null" >
-          bd_text5,
-        </if>
-      </trim>
-      <trim prefix="values (" suffix=")" suffixOverrides="," >
-        <if test="item.bd_bomid != null" >
-          #{item.bd_bomid},
-        </if>
-        <if test="bd_detno != null" >
-          #{item.bd_detno,jdbcType=INTEGER},
-        </if>
-        <if test="bd_sonid != null" >
-          #{item.bd_sonid,jdbcType=INTEGER},
-        </if>
-        <if test="bd_soncode != null" >
-          #{item.bd_soncode,jdbcType=VARCHAR},
-        </if>
-        <if test="bd_unit != null" >
-          #{item.bd_unit,jdbcType=VARCHAR},
-        </if>
-        <if test="bd_baseqty != null" >
-          #{item.bd_baseqty,jdbcType=INTEGER},
-        </if>
-        <if test="bd_replace != null" >
-          #{item.bd_replace,jdbcType=VARCHAR},
-        </if>
-        <if test="bd_remark != null" >
-          #{item.bd_remark,jdbcType=VARCHAR},
-        </if>
-        <if test="comapnyId != null" >
-          #{item.comapnyId,jdbcType=INTEGER},
-        </if>
-        <if test="updaterId != null" >
-          #{item.updaterId,jdbcType=INTEGER},
-        </if>
-        <if test="updateTime != null" >
-          #{item.updateTime,jdbcType=TIMESTAMP},
-        </if>
-        <if test="bd_text1 != null" >
-          #{item.bd_text1,jdbcType=VARCHAR},
-        </if>
-        <if test="bd_text2 != null" >
-          #{item.bd_text2,jdbcType=VARCHAR},
-        </if>
-        <if test="bd_text3 != null" >
-          #{item.bd_text3,jdbcType=VARCHAR},
-        </if>
-        <if test="bd_text4 != null" >
-          #{item.bd_text4,jdbcType=VARCHAR},
-        </if>
-        <if test="bd_text5 != null" >
-          #{item.bd_text5,jdbcType=VARCHAR},
-        </if>
-      </trim>
+      (
+      #{item.bd_bomid,jdbcType=INTEGER}, #{item.bd_detno,jdbcType=INTEGER},
+      #{item.bd_sonid,jdbcType=INTEGER}, #{item.bd_soncode,jdbcType=VARCHAR}, #{item.bd_unit,jdbcType=VARCHAR},
+      #{item.bd_baseqty,jdbcType=INTEGER}, #{item.bd_replace,jdbcType=VARCHAR}, #{item.bd_remark,jdbcType=VARCHAR},
+      #{item.companyId,jdbcType=INTEGER}, #{item.updaterId,jdbcType=INTEGER}, #{item.updateTime,jdbcType=TIMESTAMP},
+      #{item.bd_text1,jdbcType=VARCHAR}, #{item.bd_text2,jdbcType=VARCHAR}, #{item.bd_text3,jdbcType=VARCHAR},
+      #{item.bd_text4,jdbcType=VARCHAR}, #{item.bd_text5,jdbcType=VARCHAR}
+      )
     </foreach>
   </insert>
 
@@ -360,8 +274,8 @@
         <if test="bd_remark != null" >
           bd_remark = #{item.bd_remark,jdbcType=VARCHAR},
         </if>
-        <if test="comapnyId != null" >
-          comapnyId = #{item.comapnyId,jdbcType=INTEGER},
+        <if test="companyId != null" >
+          companyId = #{item.companyId,jdbcType=INTEGER},
         </if>
         <if test="updaterId != null" >
           updaterId = #{item.updaterId,jdbcType=INTEGER},

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

@@ -37,6 +37,9 @@
     where bo_id = #{id}
   </delete>
   <insert id="insert" parameterType="com.usoftchina.saas.document.entities.Bom" >
+    <selectKey resultType="java.lang.Long" keyProperty="id">
+      SELECT LAST_INSERT_ID() AS ID
+    </selectKey>
     insert into bom (bo_motherid, bo_mothercode,
       bo_mothername, bo_version, bo_status, 
       bo_statuscode, bo_recorderid, bo_recorder, 
@@ -53,6 +56,9 @@
       )
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Bom" >
+    <selectKey resultType="java.lang.Long" keyProperty="id">
+      SELECT LAST_INSERT_ID() AS ID
+    </selectKey>
     insert into bom
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="bo_motherid != null" >
@@ -251,4 +257,16 @@
   <select id="getCodeById" resultType="string">
       SELECT BO_MOTHERCODE FROM BOM WHERE BO_ID = #{id} and COMPANYID = #{companyId}
   </select>
+  <select id="getListData" resultMap="BaseResultMap">
+    SELECT * FROM BOM
+    <where>
+      <if test="condition!=null">
+        ${condition}
+      </if>
+      <if test="companyId!=null">
+        AND companyId = #{companyId}
+      </if>
+    </where>
+    ORDER BY BO_ID
+  </select>
 </mapper>

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/VendorcontactMapper.xml

@@ -226,103 +226,22 @@
     where vc_id = #{id}
   </update>
   <insert id="batchInsert" parameterType="java.util.List">
-    <foreach collection="list" item="item" separator=",">
-      INSERT INTO VENDORCONTACT
-      <trim prefix="(" suffix=")" suffixOverrides=",">
-        <if test="item.vc_veid != null" >
-          vc_veid,
-        </if>
-        <if test="item.vc_detno != null" >
-          vc_detno,
-        </if>
-        <if test="item.vc_name != null" >
-          vc_name,
-        </if>
-        <if test="item.vc_tel != null" >
-          vc_tel,
-        </if>
-        <if test="item.vc_qq != null" >
-          vc_qq,
-        </if>
-        <if test="item.vc_email != null" >
-          vc_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.vc_text1 != null" >
-          vc_text1,
-        </if>
-        <if test="item.vc_text2 != null" >
-          vc_text2,
-        </if>
-        <if test="item.vc_text3 != null" >
-          vc_text3,
-        </if>
-        <if test="item.vc_text4 != null" >
-          vc_text4,
-        </if>
-        <if test="item.vc_text5 != null" >
-          vc_text5,
-        </if>
-        <if test="item.vc_default != null" >
-          vc_default,
-        </if>
-      </trim>
-
-      <trim prefix="values(" suffix=")" suffixOverrides=",">
-        <if test="item.vc_veid != null" >
-          #{item.vc_veid},
-        </if>
-        <if test="item.vc_detno != null" >
-          #{item.vc_detno,jdbcType=INTEGER},
-        </if>
-        <if test="item.vc_name != null" >
-          #{item.vc_name,jdbcType=VARCHAR},
-        </if>
-        <if test="item.vc_tel != null" >
-          #{item.vc_tel,jdbcType=INTEGER},
-        </if>
-        <if test="item.vc_qq != null" >
-          #{item.vc_qq,jdbcType=VARCHAR},
-        </if>
-        <if test="item.vc_email != null" >
-          #{item.vc_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.vc_text1 != null" >
-          #{item.vc_text1,jdbcType=VARCHAR},
-        </if>
-        <if test="item.vc_text2 != null" >
-          #{item.vc_text2,jdbcType=VARCHAR},
-        </if>
-        <if test="item.vc_text3 != null" >
-          #{item.vc_text3,jdbcType=VARCHAR},
-        </if>
-        <if test="item.vc_text4 != null" >
-          #{item.vc_text4,jdbcType=VARCHAR},
-        </if>
-        <if test="item.vc_text5 != null" >
-          #{item.vc_text5,jdbcType=VARCHAR},
-        </if>
-        <if test="item.vc_default != null" >
-          #{item.vc_default,jdbcType=VARCHAR},
-        </if>
-      </trim>
+      INSERT INTO VENDORCONTACT(vc_veid, vc_detno,
+        vc_name, vc_tel, vc_qq,
+        vc_email, companyId, updaterId,
+        updateTime, vc_text1, vc_text2,
+        vc_text3, vc_text4, vc_text5, vc_default
+        )
+        values
+    <foreach collection="list" item="item" index="index" open="" close="" separator=",">
+      (
+      #{item.vc_veid}, #{item.vc_detno,jdbcType=INTEGER},
+      #{item.vc_name,jdbcType=VARCHAR}, #{item.vc_tel,jdbcType=INTEGER}, #{item.vc_qq,jdbcType=VARCHAR},
+      #{item.vc_email,jdbcType=VARCHAR}, #{item.companyId,jdbcType=INTEGER}, #{item.updaterId,jdbcType=INTEGER},
+      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.vc_text1,jdbcType=VARCHAR}, #{item.vc_text2,jdbcType=VARCHAR},
+      #{item.vc_text3,jdbcType=VARCHAR}, #{item.vc_text4,jdbcType=VARCHAR}, #{item.vc_text5,jdbcType=VARCHAR},
+      #{item.vc_default,jdbcType=VARCHAR}
+      )
     </foreach>
   </insert>
   <update id="batchUpdate" parameterType="com.usoftchina.saas.document.entities.Vendorcontact">

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/money/money-server/src/main/java/com/usoftchina/saas/money/controller/OthspengdingsController.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
  * @date 2018/10/24 22:15
  **/
 @RestController
-@RequestMapping("/othspengdings")
+@RequestMapping("/othspendings")
 public class OthspengdingsController {
     @Autowired
     private OthspendingsService othspendingsService;

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/BanksubledgerMapper.java

@@ -19,7 +19,7 @@ public interface BanksubledgerMapper extends CommonBaseMapper<Banksubledger> {
 
     int deleteByPrimaryKey(Integer bl_id);
 
-    Long insert(Banksubledger record);
+//    Long insert(Banksubledger record);
 
     int insertSelective(Banksubledger record);
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/PaybalanceMapper.java

@@ -11,7 +11,7 @@ public interface PaybalanceMapper extends CommonBaseMapper<Paybalance> {
 
     int deleteByPrimaryKey(Integer pb_id);
 
-    Long insert(Paybalance record);
+//    Long insert(Paybalance record);
 
     int insertSelective(Paybalance record);
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/RecbalanceMapper.java

@@ -21,7 +21,7 @@ public interface RecbalanceMapper extends CommonBaseMapper<Recbalance> {
 
     int deleteByPrimaryKey(Integer rb_id);
 
-    Long insert(Recbalance record);
+//    Long insert(Recbalance record);
 
     int insertSelective(Recbalance record);
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Banksubledger.java

@@ -162,23 +162,4 @@ public class Banksubledger extends CommonBaseEntity implements Serializable {
         this.bl_remark = bl_remark == null ? null : bl_remark.trim();
     }
 
-    @Override
-    public void setCreatorId(long creatorId) {
-
-    }
-
-    @Override
-    public void setUpdaterId(long updaterId) {
-
-    }
-
-    @Override
-    public long getCompanyId() {
-        return 0;
-    }
-
-    @Override
-    public void setCompanyId(long companyId) {
-
-    }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Fundtransferdetail.java

@@ -196,4 +196,29 @@ public class Fundtransferdetail extends CommonBaseEntity implements Serializable
     public void setFtd_text5(String ftd_text5) {
         this.ftd_text5 = ftd_text5;
     }
+
+    @Override
+    public String toString() {
+        return "Fundtransferdetail{" +
+                "ftd_ftid=" + ftd_ftid +
+                ", ftd_detno=" + ftd_detno +
+                ", ftd_ym=" + ftd_ym +
+                ", ftd_bankid=" + ftd_bankid +
+                ", ftd_bankcode='" + ftd_bankcode + '\'' +
+                ", ftd_bankname='" + ftd_bankname + '\'' +
+                ", ftd_inbankid=" + ftd_inbankid +
+                ", ftd_inbankcode='" + ftd_inbankcode + '\'' +
+                ", ftd_inbankname='" + ftd_inbankname + '\'' +
+                ", ftd_nowbalance=" + ftd_nowbalance +
+                ", ftd_paymethod='" + ftd_paymethod + '\'' +
+                ", ftd_paycode='" + ftd_paycode + '\'' +
+                ", ftd_remark='" + ftd_remark + '\'' +
+                ", updatedate=" + updatedate +
+                ", ftd_text1='" + ftd_text1 + '\'' +
+                ", ftd_text2='" + ftd_text2 + '\'' +
+                ", ftd_text3='" + ftd_text3 + '\'' +
+                ", ftd_text4='" + ftd_text4 + '\'' +
+                ", ftd_text5='" + ftd_text5 + '\'' +
+                '}';
+    }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/FundtransferServiceImpl.java

@@ -43,6 +43,8 @@ public class FundtransferServiceImpl implements FundtransferService {
         Fundtransfer fundtransfer = fundtran.getMain();
         List<Fundtransferdetail> fundtransferdetails = fundtran.getItems();
 
+        System.out.println("fun:"+fundtransferdetails);
+
         String ft_code = fundtransfer.getFt_code();
 
         //编号校验
@@ -65,7 +67,7 @@ public class FundtransferServiceImpl implements FundtransferService {
         Iterator isdet = fundtransferdetails.iterator();
         while (isdet.hasNext()){
             Fundtransferdetail fundtransferdetail= (Fundtransferdetail) isdet.next();
-            fundtransfer.setCompanyId(BaseContextHolder.getCompanyId());
+            fundtransferdetail.setCompanyId(BaseContextHolder.getCompanyId());
             fundtransferdetail.setFtd_ftid(Math.toIntExact(id));
             if (fundtransferdetail.getId() > 0 ){
                 fundtransferdetailMapper.updateByPrimaryKey(fundtransferdetail);

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/OthspendingsServiceImpl.java

@@ -55,14 +55,18 @@ public class OthspendingsServiceImpl implements OthspendingsService {
         if (othspendings.getId() > 0){
             othspendingsMapper.updateByPrimaryKeySelective(othspendings);
         }else {
-            othspendingsMapper.insert(othspendings);
+            othspendings.setCompanyId(BaseContextHolder.getCompanyId());
+            othspendingsMapper.insertSelective(othspendings);
+            id = othspendings.getId();
         }
 
         Iterator isdet = othspendingsdetails.iterator();
         while (isdet.hasNext()){
             Othspendingsdetail othspendingsdetail = (Othspendingsdetail) isdet.next();
-            if (othspendingsdetail.getOsd_orid() > 0 ){
-                othspendingsdetailMapper.updateByPrimaryKey(othspendingsdetail);
+            othspendingsdetail.setOsd_orid(Math.toIntExact(id));
+            othspendingsdetail.setCompanyId(BaseContextHolder.getCompanyId());
+            if (othspendingsdetail.getId() > 0 ){
+                othspendingsdetailMapper.updateByPrimaryKeySelective(othspendingsdetail);
             }else {
                 othspendingsdetailMapper.insertSelective(othspendingsdetail);
             }
@@ -138,7 +142,7 @@ public class OthspendingsServiceImpl implements OthspendingsService {
         Long companyId = BaseContextHolder.getCompanyId();
         Integer count = "0".equals(String.valueOf(id)) ? othspendingsMapper.validateCodeWhenInsert(code, companyId) :
                 othspendingsMapper.validateCodeWhenUpdate(code, id, companyId);
-        return maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.OTHRECEIPTS.getCaller()).getData();
+        return maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.OTHSPENDINGS.getCaller()).getData();
     }
 
     private List<Othspendings> getListByMode(ListReqDTO req) {

applications/money/money-server/src/main/resources/mapper/FundtransferdetailMapper.xml

@@ -16,7 +16,7 @@
     <result column="ftd_paymethod" property="ftd_paymethod" jdbcType="VARCHAR" />
     <result column="ftd_paycode" property="ftd_paycode" jdbcType="VARCHAR" />
     <result column="ftd_remark" property="ftd_remark" jdbcType="VARCHAR" />
-    <result column="companyId" property="companyId" jdbcType="INTEGER" />
+    <result column="companyid" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
     <result column="updatedate" property="updatedate" jdbcType="TIMESTAMP" />
     <result column="ftd_text1" property="ftd_text1" jdbcType="VARCHAR" />
@@ -28,13 +28,13 @@
   <sql id="Base_Column_List" >
     ftd_id, ftd_ftid, ftd_detno, ftd_ym, ftd_bankid, ftd_bankcode, ftd_bankname, ftd_inbankid, 
     ftd_inbankcode, ftd_inbankname, ftd_nowbalance, ftd_paymethod, ftd_paycode, ftd_remark, 
-    companyId, updaterId, updatedate, ftd_text1, ftd_text2, ftd_text3, ftd_text4, ftd_text5
+    companyid, updaterId, updatedate, ftd_text1, ftd_text2, ftd_text3, ftd_text4, ftd_text5
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />
     from fundtransferdetail
-    where ftd_id = #{id,jdbcType=INTEGER}
+    where ftd_ftid = #{id,jdbcType=INTEGER}
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
@@ -52,7 +52,7 @@
       ftd_ym, ftd_bankid, ftd_bankcode, 
       ftd_bankname, ftd_inbankid, ftd_inbankcode, 
       ftd_inbankname, ftd_nowbalance, ftd_paymethod, 
-      ftd_paycode, ftd_remark, companyId, 
+      ftd_paycode, ftd_remark, companyid,
       updaterId, updatedate, ftd_text1, 
       ftd_text2, ftd_text3, ftd_text4, 
       ftd_text5)
@@ -108,7 +108,7 @@
         ftd_remark,
       </if>
       <if test="companyId != null" >
-        companyId,
+        companyid,
       </if>
       <if test="updaterId != null" >
         updaterId,
@@ -241,7 +241,7 @@
         ftd_remark = #{ftd_remark,jdbcType=VARCHAR},
       </if>
       <if test="companyId != null" >
-        companyId = #{companyId,jdbcType=INTEGER},
+        companyid = #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
@@ -282,7 +282,7 @@
       ftd_paymethod = #{ftdPaymethod,jdbcType=VARCHAR},
       ftd_paycode = #{ftdPaycode,jdbcType=VARCHAR},
       ftd_remark = #{ftdRemark,jdbcType=VARCHAR},
-      companyId = #{companyId,jdbcType=INTEGER},
+      companyid = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterid,jdbcType=INTEGER},
       updatedate = #{updatedate,jdbcType=TIMESTAMP},
       ftd_text1 = #{ftdText1,jdbcType=VARCHAR},

applications/money/money-server/src/main/resources/mapper/OthreceiptsdetailMapper.xml

@@ -26,7 +26,7 @@
     select 
     <include refid="Base_Column_List" />
     from othreceiptsdetail
-    where ord_id = #{id,jdbcType=INTEGER}
+    where ord_orid = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from othreceiptsdetail

applications/money/money-server/src/main/resources/mapper/OthspendingsMapper.xml

@@ -66,219 +66,223 @@
   <insert id="insertSelective" parameterType="com.usoftchina.saas.money.po.Othspendings" >
     insert into othspendings
     <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="osCode != null" >
+
+      <if test="os_code != null" >
         os_code,
       </if>
-      <if test="osDate != null" >
+      <if test="os_date != null" >
         os_date,
       </if>
-      <if test="osVendid != null" >
+      <if test="os_vendid != null" >
         os_vendid,
       </if>
-      <if test="osVendcode != null" >
+      <if test="os_vendcode != null" >
         os_vendcode,
       </if>
-      <if test="osVendname != null" >
+      <if test="os_vendname != null" >
         os_vendname,
       </if>
-      <if test="osBankid != null" >
+      <if test="os_bankid != null" >
         os_bankid,
       </if>
-      <if test="osBankcode != null" >
+      <if test="os_bankcode != null" >
         os_bankcode,
       </if>
-      <if test="osBankname != null" >
+      <if test="os_bankname != null" >
         os_bankname,
       </if>
-      <if test="osAmount != null" >
+      <if test="os_amount != null" >
         os_amount,
       </if>
-      <if test="osRecorderid != null" >
+      <if test="os_recorderid != null" >
         os_recorderid,
       </if>
-      <if test="osRecorder != null" >
+      <if test="os_recorder != null" >
         os_recorder,
       </if>
-      <if test="osRecorddate != null" >
+      <if test="os_recorddate != null" >
         os_recorddate,
       </if>
-      <if test="osStatus != null" >
+      <if test="os_status != null" >
         os_status,
       </if>
-      <if test="osStatuscode != null" >
+      <if test="os_statuscode != null" >
         os_statuscode,
       </if>
-      <if test="osRemark != null" >
+      <if test="os_remark != null" >
         os_remark,
       </if>
       <if test="companyId != null" >
         companyId,
       </if>
-      <if test="updaterid != null" >
+      <if test="updaterId != null" >
         updaterId,
       </if>
       <if test="updatedate != null" >
         updatedate,
       </if>
-      <if test="osText1 != null" >
+      <if test="os_text1 != null" >
         os_text1,
       </if>
-      <if test="osText2 != null" >
+      <if test="os_text2 != null" >
         os_text2,
       </if>
-      <if test="osText3 != null" >
+      <if test="os_text3 != null" >
         os_text3,
       </if>
-      <if test="osText4 != null" >
+      <if test="os_text4 != null" >
         os_text4,
       </if>
-      <if test="osText5 != null" >
+      <if test="os_text5 != null" >
         os_text5,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="osCode != null" >
-        #{osCode,jdbcType=VARCHAR},
+      <if test="os_code != null" >
+        #{os_code,jdbcType=VARCHAR},
       </if>
-      <if test="osDate != null" >
-        #{osDate,jdbcType=TIMESTAMP},
+      <if test="os_date != null" >
+        #{os_date,jdbcType=TIMESTAMP},
       </if>
-      <if test="osVendid != null" >
-        #{osVendid,jdbcType=INTEGER},
+      <if test="os_vendid != null" >
+        #{os_vendid,jdbcType=INTEGER},
       </if>
-      <if test="osVendcode != null" >
-        #{osVendcode,jdbcType=VARCHAR},
+      <if test="os_vendcode != null" >
+        #{os_vendcode,jdbcType=VARCHAR},
       </if>
-      <if test="osVendname != null" >
-        #{osVendname,jdbcType=VARCHAR},
+      <if test="os_vendname != null" >
+        #{os_vendname,jdbcType=VARCHAR},
       </if>
-      <if test="osBankid != null" >
-        #{osBankid,jdbcType=INTEGER},
+      <if test="os_bankid != null" >
+        #{os_bankid,jdbcType=INTEGER},
       </if>
-      <if test="osBankcode != null" >
-        #{osBankcode,jdbcType=VARCHAR},
+      <if test="os_bankcode != null" >
+        #{os_bankcode,jdbcType=VARCHAR},
       </if>
-      <if test="osBankname != null" >
-        #{osBankname,jdbcType=VARCHAR},
+      <if test="os_bankname != null" >
+        #{os_bankname,jdbcType=VARCHAR},
       </if>
-      <if test="osAmount != null" >
-        #{osAmount,jdbcType=DOUBLE},
+      <if test="os_amount != null" >
+        #{os_amount,jdbcType=DOUBLE},
       </if>
-      <if test="osRecorderid != null" >
-        #{osRecorderid,jdbcType=INTEGER},
+      <if test="os_recorderid != null" >
+        #{os_recorderid,jdbcType=INTEGER},
       </if>
-      <if test="osRecorder != null" >
-        #{osRecorder,jdbcType=VARCHAR},
+      <if test="os_recorder != null" >
+        #{os_recorder,jdbcType=VARCHAR},
       </if>
-      <if test="osRecorddate != null" >
-        #{osRecorddate,jdbcType=TIMESTAMP},
+      <if test="os_recorddate != null" >
+        #{os_recorddate,jdbcType=TIMESTAMP},
       </if>
-      <if test="osStatus != null" >
-        #{osStatus,jdbcType=INTEGER},
+      <if test="os_status != null" >
+        #{os_status,jdbcType=VARCHAR},
       </if>
-      <if test="osStatuscode != null" >
-        #{osStatuscode,jdbcType=DECIMAL},
+      <if test="os_statuscode != null" >
+        #{os_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="osRemark != null" >
-        #{osRemark,jdbcType=VARCHAR},
+      <if test="os_remark != null" >
+        #{os_remark,jdbcType=VARCHAR},
       </if>
       <if test="companyId != null" >
         #{companyId,jdbcType=INTEGER},
       </if>
-      <if test="updaterid != null" >
-        #{updaterid,jdbcType=INTEGER},
+      <if test="updaterId != null" >
+        #{updaterId,jdbcType=INTEGER},
       </if>
       <if test="updatedate != null" >
         #{updatedate,jdbcType=TIMESTAMP},
       </if>
-      <if test="osText1 != null" >
-        #{osText1,jdbcType=VARCHAR},
+      <if test="os_text1 != null" >
+        #{os_text1,jdbcType=VARCHAR},
       </if>
-      <if test="osText2 != null" >
-        #{osText2,jdbcType=VARCHAR},
+      <if test="os_text2 != null" >
+        #{os_text2,jdbcType=VARCHAR},
       </if>
-      <if test="osText3 != null" >
-        #{osText3,jdbcType=VARCHAR},
+      <if test="os_text3 != null" >
+        #{os_text3,jdbcType=VARCHAR},
       </if>
-      <if test="osText4 != null" >
-        #{osText4,jdbcType=VARCHAR},
+      <if test="os_text4 != null" >
+        #{os_text4,jdbcType=VARCHAR},
       </if>
-      <if test="osText5 != null" >
-        #{osText5,jdbcType=VARCHAR},
+      <if test="os_text5 != null" >
+        #{os_text5,jdbcType=VARCHAR},
       </if>
     </trim>
+    <selectKey resultType="Long" keyProperty="id" order="AFTER">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Othspendings" >
     update othspendings
     <set >
-      <if test="osCode != null" >
-        os_code = #{osCode,jdbcType=VARCHAR},
+      <if test="os_code != null" >
+        os_code = #{os_code,jdbcType=VARCHAR},
       </if>
-      <if test="osDate != null" >
-        os_date = #{osDate,jdbcType=TIMESTAMP},
+      <if test="os_date != null" >
+        os_date = #{os_date,jdbcType=TIMESTAMP},
       </if>
-      <if test="osVendid != null" >
-        os_vendid = #{osVendid,jdbcType=INTEGER},
+      <if test="os_vendid != null" >
+        os_vendid = #{os_vendid,jdbcType=INTEGER},
       </if>
-      <if test="osVendcode != null" >
-        os_vendcode = #{osVendcode,jdbcType=VARCHAR},
+      <if test="os_vendcode != null" >
+        os_vendcode = #{os_vendcode,jdbcType=VARCHAR},
       </if>
-      <if test="osVendname != null" >
-        os_vendname = #{osVendname,jdbcType=VARCHAR},
+      <if test="os_vendname != null" >
+        os_vendname = #{os_vendname,jdbcType=VARCHAR},
       </if>
-      <if test="osBankid != null" >
-        os_bankid = #{osBankid,jdbcType=INTEGER},
+      <if test="os_bankid != null" >
+        os_bankid = #{os_bankid,jdbcType=INTEGER},
       </if>
-      <if test="osBankcode != null" >
-        os_bankcode = #{osBankcode,jdbcType=VARCHAR},
+      <if test="os_bankcode != null" >
+        os_bankcode = #{os_bankcode,jdbcType=VARCHAR},
       </if>
-      <if test="osBankname != null" >
-        os_bankname = #{osBankname,jdbcType=VARCHAR},
+      <if test="os_bankname != null" >
+        os_bankname = #{os_bankname,jdbcType=VARCHAR},
       </if>
-      <if test="osAmount != null" >
-        os_amount = #{osAmount,jdbcType=DOUBLE},
+      <if test="os_amount != null" >
+        os_amount = #{os_amount,jdbcType=DOUBLE},
       </if>
-      <if test="osRecorderid != null" >
-        os_recorderid = #{osRecorderid,jdbcType=INTEGER},
+      <if test="os_recorderid != null" >
+        os_recorderid = #{os_recorderid,jdbcType=INTEGER},
       </if>
-      <if test="osRecorder != null" >
-        os_recorder = #{osRecorder,jdbcType=VARCHAR},
+      <if test="os_recorder != null" >
+        os_recorder = #{os_recorder,jdbcType=VARCHAR},
       </if>
-      <if test="osRecorddate != null" >
-        os_recorddate = #{osRecorddate,jdbcType=TIMESTAMP},
+      <if test="os_recorddate != null" >
+        os_recorddate = #{os_recorddate,jdbcType=TIMESTAMP},
       </if>
-      <if test="osStatus != null" >
-        os_status = #{osStatus,jdbcType=INTEGER},
+      <if test="os_status != null" >
+        os_status = #{os_status,jdbcType=VARCHAR},
       </if>
-      <if test="osStatuscode != null" >
-        os_statuscode = #{osStatuscode,jdbcType=DECIMAL},
+      <if test="os_statuscode != null" >
+        os_statuscode = #{os_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="osRemark != null" >
-        os_remark = #{osRemark,jdbcType=VARCHAR},
+      <if test="os_remark != null" >
+        os_remark = #{os_remark,jdbcType=VARCHAR},
       </if>
       <if test="companyId != null" >
         companyId = #{companyId,jdbcType=INTEGER},
       </if>
-      <if test="updaterid != null" >
-        updaterId = #{updaterid,jdbcType=INTEGER},
+      <if test="updaterId != null" >
+        updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
       <if test="updatedate != null" >
         updatedate = #{updatedate,jdbcType=TIMESTAMP},
       </if>
-      <if test="osText1 != null" >
-        os_text1 = #{osText1,jdbcType=VARCHAR},
+      <if test="os_text1 != null" >
+        os_text1 = #{os_text1,jdbcType=VARCHAR},
       </if>
-      <if test="osText2 != null" >
-        os_text2 = #{osText2,jdbcType=VARCHAR},
+      <if test="os_text2 != null" >
+        os_text2 = #{os_text2,jdbcType=VARCHAR},
       </if>
-      <if test="osText3 != null" >
-        os_text3 = #{osText3,jdbcType=VARCHAR},
+      <if test="os_text3 != null" >
+        os_text3 = #{os_text3,jdbcType=VARCHAR},
       </if>
-      <if test="osText4 != null" >
-        os_text4 = #{osText4,jdbcType=VARCHAR},
+      <if test="os_text4 != null" >
+        os_text4 = #{os_text4,jdbcType=VARCHAR},
       </if>
-      <if test="osText5 != null" >
-        os_text5 = #{osText5,jdbcType=VARCHAR},
+      <if test="os_text5 != null" >
+        os_text5 = #{os_text5,jdbcType=VARCHAR},
       </if>
     </set>
     where os_id = #{id,jdbcType=INTEGER}

applications/money/money-server/src/main/resources/mapper/OthspendingsdetailMapper.xml

@@ -26,7 +26,7 @@
     select 
     <include refid="Base_Column_List" />
     from othspendingsdetail
-    where osd_id = #{osd_orid,jdbcType=INTEGER}
+    where osd_orid = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from othspendingsdetail
@@ -142,6 +142,9 @@
         #{osd_text5,jdbcType=VARCHAR},
       </if>
     </trim>
+    <selectKey resultType="Long" keyProperty="id" order="AFTER">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Othspendingsdetail" >
     update othspendingsdetail

applications/money/money-server/src/main/resources/mapper/PaybalancedetailMapper.xml

@@ -31,7 +31,7 @@
     select
     <include refid="Base_Column_List" />
     from paybalancedetail
-    where pbd_id = #{id,jdbcType=INTEGER}
+    where pbd_pbid = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteItem" parameterType="java.lang.Integer" >
     delete from paybalancedetail

applications/money/money-server/src/main/resources/mapper/RecbalancedetMapper.xml

@@ -89,7 +89,7 @@
     select 
     <include refid="Base_Column_List" />
     from recbalancedet
-    where rd_id = #{id,jdbcType=INTEGER}
+    where rd_rbid = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteItem" parameterType="java.lang.Integer">
     delete from recbalancedet

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

@@ -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-dto/src/main/java/com/usoftchina/saas/sale/dto/ProdIODetailDTO.java

@@ -12,7 +12,9 @@ import java.io.Serializable;
  * 2018-10-23
  */
 @Data
-public class ProdIODetailDTO extends CommonBaseEntity implements Serializable {
+public class ProdIODetailDTO implements Serializable {
+
+    private Long id;
 
     private Long pd_piid;
 

applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/ProdInOutDTO.java

@@ -1,6 +1,6 @@
 package com.usoftchina.saas.sale.dto;
 
-import com.usoftchina.saas.base.entity.CommonBaseEntity;
+
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
@@ -12,7 +12,9 @@ import java.util.Date;
  * 2018-10-23
  */
 @Data
-public class ProdInOutDTO extends CommonBaseEntity implements Serializable {
+public class ProdInOutDTO implements Serializable {
+
+    protected Long id;
 
     private String pi_inoutno;
 

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/mapper/ProdIODetailMapper.java

@@ -8,9 +8,6 @@ import java.util.List;
 
 public interface ProdIODetailMapper extends CommonBaseMapper<ProdIODetail> {
 
-
-    int deleteByExample(ProdIODetailExample example);
-
     int insert(ProdIODetail record);
 
     int insertSelective(ProdIODetail record);

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/mapper/ProdInOutMapper.java

@@ -9,28 +9,14 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 public interface ProdInOutMapper extends CommonBaseMapper<ProdInOut> {
-    long countByExample(ProdInOutExample example);
-
-    int deleteByExample(ProdInOutExample example);
-
     int deleteByPrimaryKey(Long pi_id);
 
     int insert(ProdInOut record);
 
     int insertSelective(ProdInOut record);
 
-    List<ProdInOut> selectByExampleWithBLOBs(ProdInOutExample example);
-
-    List<ProdInOut> selectByExample(ProdInOutExample example);
-
     ProdInOut selectByPrimaryKey(Long pi_id);
 
-    int updateByExampleSelective(@Param("record") ProdInOut record, @Param("example") ProdInOutExample example);
-
-    int updateByExampleWithBLOBs(@Param("record") ProdInOut record, @Param("example") ProdInOutExample example);
-
-    int updateByExample(@Param("record") ProdInOut record, @Param("example") ProdInOutExample example);
-
     int updateByPrimaryKeySelective(ProdInOut record);
 
     int updateByPrimaryKeyWithBLOBs(ProdInOut record);

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

@@ -8,7 +8,6 @@ import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
-import com.usoftchina.saas.commons.dto.DocSavedDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.commons.po.BillCodeSeq;
@@ -56,9 +55,8 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         //查询主表
         ProdInOut prodInOut = checkAndReturnOrder(id);
         //将prodInOut实体对象转化为传输对象
-        ProdInOutDTO main = BeanMapper.map(prodInOut,ProdInOutDTO.class);
+        ProdInOutDTO main = BeanMapper.map(prodInOut, ProdInOutDTO.class);
         //查询从表
-
         List<ProdIODetail> prodIODetails = prodIODetailMapper.selectByFK(id);
         List<ProdIODetailDTO> items = BeanMapper.mapList(prodIODetails,ProdIODetailDTO.class);
         prodInOutFormDTO.setMain(main);
@@ -189,7 +187,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             }
             String res = singleAudit(formData.getMain());
             if(StringUtils.hasText(res)){
-                new BizException(501,res);
+                throw new BizException(501,res);
             }
         }
         baseDTO.setId(id);
@@ -204,10 +202,9 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         map.put("commitid",BaseContextHolder.getUserId());
         map.put("companyid",BaseContextHolder.getCompanyId());
         map.put("result","");
-        warehouseApi.post(map);
-        Object result =  map.get("result");
-        System.out.println("result:"+result);
-        if(result!=null){
+        Result res = warehouseApi.post(map);
+        Object result =  res.getData();
+        if(!StringUtils.isEmpty(result)){
             return result.toString();
         }else{
             //记录日志
@@ -242,9 +239,9 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         map.put("commitid",BaseContextHolder.getUserId());
         map.put("companyid",BaseContextHolder.getCompanyId());
         map.put("result","");
-        warehouseApi.unPost(map);
-        Object result =  map.get("result");
-        if(result!=null){
+        Result res = warehouseApi.unPost(map);
+        Object result =  res.getData();
+        if(!StringUtils.isEmpty(result)){
             return result.toString();
         }else{
             //更新状态为未审核
@@ -303,7 +300,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             error+=singleUnAudit(prodInOutDTO);
         }
         if(!StringUtils.isEmpty(error)){
-            new BizException(501,error);
+            throw new BizException(501,error);
         }
     }
 

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

@@ -41,7 +41,7 @@
     <result column="pd_ym" jdbcType="INTEGER" property="pd_ym" />
     <result column="pd_yqty" jdbcType="INTEGER" property="pd_yqty" />
     <result column="pd_ioid" jdbcType="INTEGER" property="pd_ioid" />
-    <association property="product" javaType="com.usoftchina.saas.document.entities.Product">
+    <association property="productDTO" javaType="com.usoftchina.saas.document.entities.Product">
       <id column="pr_id" property="id"/>
       <result column="pr_code" property="pr_code"/>
       <result column="pr_detail" property="pr_detail"/>
@@ -143,34 +143,7 @@
   <sql id="Blob_Column_List">
     pd_remark
   </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.usoftchina.saas.storage.po.ProdIODetailExample" resultMap="ResultMapWithBLOBs">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from prodiodetail
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByExample" parameterType="com.usoftchina.saas.storage.po.ProdIODetailExample" resultMap="BaseResultMap">
-    select
-        *
-    from prodiodetail a left join product b on a.pd_prodid = b.pr_id and a.companyid = b.companyid
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
+   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
     select 
     <include refid="Base_Column_List" />
     ,
@@ -184,12 +157,6 @@
   <delete id="deleteByForeignKey" parameterType="java.lang.Long">
     delete from prodiodetail where pd_piid = #{pd_id}
   </delete>
-  <delete id="deleteByExample" parameterType="com.usoftchina.saas.storage.po.ProdIODetailExample">
-    delete from prodiodetail
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
   <insert id="insert" parameterType="com.usoftchina.saas.storage.po.ProdIODetail">
     insert into prodiodetail (pd_id, pd_piid, pd_inoutno, 
       pd_piclass, pd_pdno, pd_ordercode, 
@@ -465,232 +432,6 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.usoftchina.saas.storage.po.ProdIODetailExample" resultType="java.lang.Long">
-    select count(*) from prodiodetail
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update prodiodetail
-    <set>
-      <if test="record.pd_id != null">
-        pd_id = #{record.pd_id,jdbcType=INTEGER},
-      </if>
-      <if test="record.pd_piid != null">
-        pd_piid = #{record.pd_piid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pd_inoutno != null">
-        pd_inoutno = #{record.pd_inoutno,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_piclass != null">
-        pd_piclass = #{record.pd_piclass,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_pdno != null">
-        pd_pdno = #{record.pd_pdno,jdbcType=INTEGER},
-      </if>
-      <if test="record.pd_ordercode != null">
-        pd_ordercode = #{record.pd_ordercode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_orderdetno != null">
-        pd_orderdetno = #{record.pd_orderdetno,jdbcType=INTEGER},
-      </if>
-      <if test="record.pd_prodid != null">
-        pd_prodid = #{record.pd_prodid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pd_prodcode != null">
-        pd_prodcode = #{record.pd_prodcode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_unit != null">
-        pd_unit = #{record.pd_unit,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_inqty != null">
-        pd_inqty = #{record.pd_inqty,jdbcType=INTEGER},
-      </if>
-      <if test="record.pd_outqty != null">
-        pd_outqty = #{record.pd_outqty,jdbcType=INTEGER},
-      </if>
-      <if test="record.pd_orderprice != null">
-        pd_orderprice = #{record.pd_orderprice,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pd_sendprice != null">
-        pd_sendprice = #{record.pd_sendprice,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pd_price != null">
-        pd_price = #{record.pd_price,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pd_total != null">
-        pd_total = #{record.pd_total,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pd_taxrate != null">
-        pd_taxrate = #{record.pd_taxrate,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pd_netprice != null">
-        pd_netprice = #{record.pd_netprice,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pd_nettotal != null">
-        pd_nettotal = #{record.pd_nettotal,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pd_whid != null">
-        pd_whid = #{record.pd_whid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pd_whcode != null">
-        pd_whcode = #{record.pd_whcode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_whname != null">
-        pd_whname = #{record.pd_whname,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_inwhid != null">
-        pd_inwhid = #{record.pd_inwhid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pd_inwhcode != null">
-        pd_inwhcode = #{record.pd_inwhcode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_inwhname != null">
-        pd_inwhname = #{record.pd_inwhname,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_orderid != null">
-        pd_orderid = #{record.pd_orderid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pd_sdid != null">
-        pd_sdid = #{record.pd_sdid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pd_status != null">
-        pd_status = #{record.pd_status,jdbcType=INTEGER},
-      </if>
-      <if test="record.companyid != null">
-        companyid = #{record.companyid,jdbcType=INTEGER},
-      </if>
-      <if test="record.updaterid != null">
-        updaterid = #{record.updaterid,jdbcType=INTEGER},
-      </if>
-      <if test="record.updatetime != null">
-        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.pd_text1 != null">
-        pd_text1 = #{record.pd_text1,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_text2 != null">
-        pd_text2 = #{record.pd_text2,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_text3 != null">
-        pd_text3 = #{record.pd_text3,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_text4 != null">
-        pd_text4 = #{record.pd_text4,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_text5 != null">
-        pd_text5 = #{record.pd_text5,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pd_ym != null">
-        pd_ym = #{record.pd_ym,jdbcType=INTEGER},
-      </if>
-      <if test="record.pd_yqty != null">
-        pd_yqty = #{record.pd_yqty,jdbcType=INTEGER},
-      </if>
-      <if test="record.pd_remark != null">
-        pd_remark = #{record.pd_remark,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="record.pd_ioid != null">
-        pd_ioid = #{record.pd_ioid,jdbcType=INTEGER},
-      </if>
-
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    update prodiodetail
-    set pd_id = #{record.pd_id,jdbcType=INTEGER},
-      pd_piid = #{record.pd_piid,jdbcType=INTEGER},
-      pd_inoutno = #{record.pd_inoutno,jdbcType=VARCHAR},
-      pd_piclass = #{record.pd_piclass,jdbcType=VARCHAR},
-      pd_pdno = #{record.pd_pdno,jdbcType=INTEGER},
-      pd_ordercode = #{record.pd_ordercode,jdbcType=VARCHAR},
-      pd_orderdetno = #{record.pd_orderdetno,jdbcType=INTEGER},
-      pd_prodid = #{record.pd_prodid,jdbcType=INTEGER},
-      pd_prodcode = #{record.pd_prodcode,jdbcType=VARCHAR},
-      pd_unit = #{record.pd_unit,jdbcType=VARCHAR},
-      pd_inqty = #{record.pd_inqty,jdbcType=INTEGER},
-      pd_outqty = #{record.pd_outqty,jdbcType=INTEGER},
-      pd_orderprice = #{record.pd_orderprice,jdbcType=DOUBLE},
-      pd_sendprice = #{record.pd_sendprice,jdbcType=DOUBLE},
-      pd_price = #{record.pd_price,jdbcType=DOUBLE},
-      pd_total = #{record.pd_total,jdbcType=DOUBLE},
-      pd_taxrate = #{record.pd_taxrate,jdbcType=DOUBLE},
-      pd_netprice = #{record.pd_netprice,jdbcType=DOUBLE},
-      pd_nettotal = #{record.pd_nettotal,jdbcType=DOUBLE},
-      pd_whid = #{record.pd_whid,jdbcType=INTEGER},
-      pd_whcode = #{record.pd_whcode,jdbcType=VARCHAR},
-      pd_whname = #{record.pd_whname,jdbcType=VARCHAR},
-      pd_inwhid = #{record.pd_inwhid,jdbcType=INTEGER},
-      pd_inwhcode = #{record.pd_inwhcode,jdbcType=VARCHAR},
-      pd_inwhname = #{record.pd_inwhname,jdbcType=VARCHAR},
-      pd_orderid = #{record.pd_orderid,jdbcType=INTEGER},
-      pd_sdid = #{record.pd_sdid,jdbcType=INTEGER},
-      pd_status = #{record.pd_status,jdbcType=INTEGER},
-      companyid = #{record.companyid,jdbcType=INTEGER},
-      updaterid = #{record.updaterid,jdbcType=INTEGER},
-      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
-      pd_text1 = #{record.pd_text1,jdbcType=VARCHAR},
-      pd_text2 = #{record.pd_text2,jdbcType=VARCHAR},
-      pd_text3 = #{record.pd_text3,jdbcType=VARCHAR},
-      pd_text4 = #{record.pd_text4,jdbcType=VARCHAR},
-      pd_text5 = #{record.pd_text5,jdbcType=VARCHAR},
-      pd_ym = #{record.pd_ym,jdbcType=INTEGER},
-      pd_yqty = #{record.pd_yqty,jdbcType=INTEGER},
-      pd_remark = #{record.pd_remark,jdbcType=LONGVARCHAR},
-      pd_ioid = #{record.pd_ioid,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update prodiodetail
-    set pd_id = #{record.pd_id,jdbcType=INTEGER},
-      pd_piid = #{record.pd_piid,jdbcType=INTEGER},
-      pd_inoutno = #{record.pd_inoutno,jdbcType=VARCHAR},
-      pd_piclass = #{record.pd_piclass,jdbcType=VARCHAR},
-      pd_pdno = #{record.pd_pdno,jdbcType=INTEGER},
-      pd_ordercode = #{record.pd_ordercode,jdbcType=VARCHAR},
-      pd_orderdetno = #{record.pd_orderdetno,jdbcType=INTEGER},
-      pd_prodid = #{record.pd_prodid,jdbcType=INTEGER},
-      pd_prodcode = #{record.pd_prodcode,jdbcType=VARCHAR},
-      pd_unit = #{record.pd_unit,jdbcType=VARCHAR},
-      pd_inqty = #{record.pd_inqty,jdbcType=INTEGER},
-      pd_outqty = #{record.pd_outqty,jdbcType=INTEGER},
-      pd_orderprice = #{record.pd_orderprice,jdbcType=DOUBLE},
-      pd_sendprice = #{record.pd_sendprice,jdbcType=DOUBLE},
-      pd_price = #{record.pd_price,jdbcType=DOUBLE},
-      pd_total = #{record.pd_total,jdbcType=DOUBLE},
-      pd_taxrate = #{record.pd_taxrate,jdbcType=DOUBLE},
-      pd_netprice = #{record.pd_netprice,jdbcType=DOUBLE},
-      pd_nettotal = #{record.pd_nettotal,jdbcType=DOUBLE},
-      pd_whid = #{record.pd_whid,jdbcType=INTEGER},
-      pd_whcode = #{record.pd_whcode,jdbcType=VARCHAR},
-      pd_whname = #{record.pd_whname,jdbcType=VARCHAR},
-      pd_inwhid = #{record.pd_inwhid,jdbcType=INTEGER},
-      pd_inwhcode = #{record.pd_inwhcode,jdbcType=VARCHAR},
-      pd_inwhname = #{record.pd_inwhname,jdbcType=VARCHAR},
-      pd_orderid = #{record.pd_orderid,jdbcType=INTEGER},
-      pd_sdid = #{record.pd_sdid,jdbcType=INTEGER},
-      pd_status = #{record.pd_status,jdbcType=INTEGER},
-      companyid = #{record.companyid,jdbcType=INTEGER},
-      updaterid = #{record.updaterid,jdbcType=INTEGER},
-      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
-      pd_text1 = #{record.pd_text1,jdbcType=VARCHAR},
-      pd_text2 = #{record.pd_text2,jdbcType=VARCHAR},
-      pd_text3 = #{record.pd_text3,jdbcType=VARCHAR},
-      pd_text4 = #{record.pd_text4,jdbcType=VARCHAR},
-      pd_text5 = #{record.pd_text5,jdbcType=VARCHAR},
-      pd_ym = #{record.pd_ym,jdbcType=INTEGER},
-      pd_yqty = #{record.pd_yqty,jdbcType=INTEGER},
-      pd_ioid = #{record.pd_ioid,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.storage.po.ProdIODetail">
     update prodiodetail
     <set>
@@ -814,49 +555,6 @@
     </set>
     where pd_id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.usoftchina.saas.storage.po.ProdIODetail">
-    update prodiodetail
-    set pd_piid = #{pd_piid,jdbcType=INTEGER},
-      pd_inoutno = #{pd_inoutno,jdbcType=VARCHAR},
-      pd_piclass = #{pd_piclass,jdbcType=VARCHAR},
-      pd_pdno = #{pd_pdno,jdbcType=INTEGER},
-      pd_ordercode = #{pd_ordercode,jdbcType=VARCHAR},
-      pd_orderdetno = #{pd_orderdetno,jdbcType=INTEGER},
-      pd_prodid = #{pd_prodid,jdbcType=INTEGER},
-      pd_prodcode = #{pd_prodcode,jdbcType=VARCHAR},
-      pd_unit = #{pd_unit,jdbcType=VARCHAR},
-      pd_inqty = #{pd_inqty,jdbcType=INTEGER},
-      pd_outqty = #{pd_outqty,jdbcType=INTEGER},
-      pd_orderprice = #{pd_orderprice,jdbcType=DOUBLE},
-      pd_sendprice = #{pd_sendprice,jdbcType=DOUBLE},
-      pd_price = #{pd_price,jdbcType=DOUBLE},
-      pd_total = #{pd_total,jdbcType=DOUBLE},
-      pd_taxrate = #{pd_taxrate,jdbcType=DOUBLE},
-      pd_netprice = #{pd_netprice,jdbcType=DOUBLE},
-      pd_nettotal = #{pd_nettotal,jdbcType=DOUBLE},
-      pd_whid = #{pd_whid,jdbcType=INTEGER},
-      pd_whcode = #{pd_whcode,jdbcType=VARCHAR},
-      pd_whname = #{pd_whname,jdbcType=VARCHAR},
-      pd_inwhid = #{pd_inwhid,jdbcType=INTEGER},
-      pd_inwhcode = #{pd_inwhcode,jdbcType=VARCHAR},
-      pd_inwhname = #{pd_inwhname,jdbcType=VARCHAR},
-      pd_orderid = #{pd_orderid,jdbcType=INTEGER},
-      pd_sdid = #{pd_sdid,jdbcType=INTEGER},
-      pd_status = #{pd_status,jdbcType=INTEGER},
-      companyid = #{companyid,jdbcType=INTEGER},
-      updaterid = #{updaterid,jdbcType=INTEGER},
-      updatetime = #{updatetime,jdbcType=TIMESTAMP},
-      pd_text1 = #{pd_text1,jdbcType=VARCHAR},
-      pd_text2 = #{pd_text2,jdbcType=VARCHAR},
-      pd_text3 = #{pd_text3,jdbcType=VARCHAR},
-      pd_text4 = #{pd_text4,jdbcType=VARCHAR},
-      pd_text5 = #{pd_text5,jdbcType=VARCHAR},
-      pd_ym = #{pd_ym,jdbcType=INTEGER},
-      pd_yqty = #{pd_yqty,jdbcType=INTEGER},
-      pd_remark = #{pd_remark,jdbcType=LONGVARCHAR},
-      pd_ioid = #{pd_ioid,jdbcType=INTEGER}
-    where pd_id = #{pd_id,jdbcType=INTEGER}
-  </update>
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.storage.po.ProdIODetail">
     update prodiodetail
     set pd_piid = #{pd_piid,jdbcType=INTEGER},
@@ -927,251 +625,6 @@
     </foreach>
   </insert>
 
-  <insert id="batchInsert1" parameterType="java.util.List" >
-    <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=INTEGER},
-        </if>
-        <if test="item.pd_outqty != null">
-          #{item.pd_outqty,jdbcType=INTEGER},
-        </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=INTEGER},
-        </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>
-
-    </foreach>
-  </insert>
-
   <update id="batchUpdate" parameterType="com.usoftchina.saas.storage.po.ProdIODetail" >
     <foreach collection="list" item="item" index="index" open="" close="" separator=";">
       update prodiodetail <set>

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

@@ -34,8 +34,6 @@
     <result column="pi_text5" jdbcType="VARCHAR" property="pi_text5" />
     <result column="pi_auditdate" jdbcType="TIMESTAMP" property="pi_auditdate" />
     <result column="pi_auditman" jdbcType="VARCHAR" property="pi_auditman" />
-
-
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.usoftchina.saas.storage.po.ProdInOut">
     <result column="pi_address" jdbcType="LONGVARCHAR" property="pi_address" />
@@ -107,37 +105,7 @@
   <sql id="Blob_Column_List">
     pi_address
   </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.usoftchina.saas.storage.po.ProdInOutExample" resultMap="ResultMapWithBLOBs">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from prodinout
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByExample" parameterType="com.usoftchina.saas.storage.po.ProdInOutExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from prodinout
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
+    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
     select 
     <include refid="Base_Column_List" />
     ,
@@ -149,12 +117,6 @@
     delete from prodinout
     where pi_id = #{pi_id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.usoftchina.saas.storage.po.ProdInOutExample">
-    delete from prodinout
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
   <insert id="insert" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
     insert into prodinout (pi_id, pi_inoutno, pi_class, 
       pi_date, pi_vendid, pi_vendcode, 
@@ -371,188 +333,6 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.usoftchina.saas.storage.po.ProdInOutExample" resultType="java.lang.Long">
-    select count(*) from prodinout
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update prodinout
-    <set>
-      <if test="record.pi_id != null">
-        pi_id = #{record.pi_id,jdbcType=INTEGER},
-      </if>
-      <if test="record.pi_inoutno != null">
-        pi_inoutno = #{record.pi_inoutno,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_class != null">
-        pi_class = #{record.pi_class,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_date != null">
-        pi_date = #{record.pi_date,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.pi_vendid != null">
-        pi_vendid = #{record.pi_vendid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pi_vendcode != null">
-        pi_vendcode = #{record.pi_vendcode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_vendname != null">
-        pi_vendname = #{record.pi_vendname,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_custid != null">
-        pi_custid = #{record.pi_custid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pi_custcode != null">
-        pi_custcode = #{record.pi_custcode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_custname != null">
-        pi_custname = #{record.pi_custname,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_puid != null">
-        pi_puid = #{record.pi_puid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pi_pucode != null">
-        pi_pucode = #{record.pi_pucode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_said != null">
-        pi_said = #{record.pi_said},
-      </if>
-      <if test="record.pi_sacode != null">
-        pi_sacode = #{record.pi_sacode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_total != null">
-        pi_total = #{record.pi_total,jdbcType=DOUBLE},
-      </if>
-      <if test="record.pi_recordmanid != null">
-        pi_recordmanid = #{record.pi_recordmanid,jdbcType=INTEGER},
-      </if>
-      <if test="record.pi_recordman != null">
-        pi_recordman = #{record.pi_recordman,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_recorddate != null">
-        pi_recorddate = #{record.pi_recorddate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.pi_status != null">
-        pi_status = #{record.pi_status,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_statuscode != null">
-        pi_statuscode = #{record.pi_statuscode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_printstatus != null">
-        pi_printstatus = #{record.pi_printstatus,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_printstatuscode != null">
-        pi_printstatuscode = #{record.pi_printstatuscode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.companyid != null">
-        companyid = #{record.companyid,jdbcType=INTEGER},
-      </if>
-      <if test="record.updaterid != null">
-        updaterid = #{record.updaterid,jdbcType=INTEGER},
-      </if>
-      <if test="record.updatetime != null">
-        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.pi_text1 != null">
-        pi_text1 = #{record.pi_text1,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_text2 != null">
-        pi_text2 = #{record.pi_text2,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_text3 != null">
-        pi_text3 = #{record.pi_text3,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_text4 != null">
-        pi_text4 = #{record.pi_text4,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_text5 != null">
-        pi_text5 = #{record.pi_text5,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pi_address != null">
-        pi_address = #{record.pi_address,jdbcType=LONGVARCHAR},
-      </if>
-
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    update prodinout
-    set pi_id = #{record.pi_id,jdbcType=INTEGER},
-      pi_inoutno = #{record.pi_inoutno,jdbcType=VARCHAR},
-      pi_class = #{record.pi_class,jdbcType=VARCHAR},
-      pi_date = #{record.pi_date,jdbcType=TIMESTAMP},
-      pi_vendid = #{record.pi_vendid,jdbcType=INTEGER},
-      pi_vendcode = #{record.pi_vendcode,jdbcType=VARCHAR},
-      pi_vendname = #{record.pi_vendname,jdbcType=VARCHAR},
-      pi_custid = #{record.pi_custid,jdbcType=INTEGER},
-      pi_custcode = #{record.pi_custcode,jdbcType=VARCHAR},
-      pi_custname = #{record.pi_custname,jdbcType=VARCHAR},
-      pi_puid = #{record.pi_puid,jdbcType=INTEGER},
-      pi_pucode = #{record.pi_pucode,jdbcType=VARCHAR},
-      pi_said = #{record.pi_said},
-      pi_sacode = #{record.pi_sacode,jdbcType=VARCHAR},
-      pi_total = #{record.pi_total,jdbcType=DOUBLE},
-      pi_recordmanid = #{record.pi_recordmanid,jdbcType=INTEGER},
-      pi_recordman = #{record.pi_recordman,jdbcType=VARCHAR},
-      pi_recorddate = #{record.pi_recorddate,jdbcType=TIMESTAMP},
-      pi_status = #{record.pi_status,jdbcType=VARCHAR},
-      pi_statuscode = #{record.pi_statuscode,jdbcType=VARCHAR},
-      pi_printstatus = #{record.pi_printstatus,jdbcType=VARCHAR},
-      pi_printstatuscode = #{record.pi_printstatuscode,jdbcType=VARCHAR},
-      companyid = #{record.companyid,jdbcType=INTEGER},
-      updaterid = #{record.updaterid,jdbcType=INTEGER},
-      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
-      pi_text1 = #{record.pi_text1,jdbcType=VARCHAR},
-      pi_text2 = #{record.pi_text2,jdbcType=VARCHAR},
-      pi_text3 = #{record.pi_text3,jdbcType=VARCHAR},
-      pi_text4 = #{record.pi_text4,jdbcType=VARCHAR},
-      pi_text5 = #{record.pi_text5,jdbcType=VARCHAR},
-      pi_address = #{record.pi_address,jdbcType=LONGVARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update prodinout
-    set pi_id = #{record.pi_id,jdbcType=INTEGER},
-      pi_inoutno = #{record.pi_inoutno,jdbcType=VARCHAR},
-      pi_class = #{record.pi_class,jdbcType=VARCHAR},
-      pi_date = #{record.pi_date,jdbcType=TIMESTAMP},
-      pi_vendid = #{record.pi_vendid,jdbcType=INTEGER},
-      pi_vendcode = #{record.pi_vendcode,jdbcType=VARCHAR},
-      pi_vendname = #{record.pi_vendname,jdbcType=VARCHAR},
-      pi_custid = #{record.pi_custid,jdbcType=INTEGER},
-      pi_custcode = #{record.pi_custcode,jdbcType=VARCHAR},
-      pi_custname = #{record.pi_custname,jdbcType=VARCHAR},
-      pi_puid = #{record.pi_puid,jdbcType=INTEGER},
-      pi_pucode = #{record.pi_pucode,jdbcType=VARCHAR},
-      pi_said = #{record.pi_said},
-      pi_sacode = #{record.pi_sacode,jdbcType=VARCHAR},
-      pi_total = #{record.pi_total,jdbcType=DOUBLE},
-      pi_recordmanid = #{record.pi_recordmanid,jdbcType=INTEGER},
-      pi_recordman = #{record.pi_recordman,jdbcType=VARCHAR},
-      pi_recorddate = #{record.pi_recorddate,jdbcType=TIMESTAMP},
-      pi_status = #{record.pi_status,jdbcType=VARCHAR},
-      pi_statuscode = #{record.pi_statuscode,jdbcType=VARCHAR},
-      pi_printstatus = #{record.pi_printstatus,jdbcType=VARCHAR},
-      pi_printstatuscode = #{record.pi_printstatuscode,jdbcType=VARCHAR},
-      companyid = #{record.companyid,jdbcType=INTEGER},
-      updaterid = #{record.updaterid,jdbcType=INTEGER},
-      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
-      pi_text1 = #{record.pi_text1,jdbcType=VARCHAR},
-      pi_text2 = #{record.pi_text2,jdbcType=VARCHAR},
-      pi_text3 = #{record.pi_text3,jdbcType=VARCHAR},
-      pi_text4 = #{record.pi_text4,jdbcType=VARCHAR},
-      pi_text5 = #{record.pi_text5,jdbcType=VARCHAR}
-
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
     update prodinout
     <set>

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-dto/src/main/java/com/usoftchina/saas/storage/po/ProdIODetail.java

@@ -57,7 +57,7 @@ public class ProdIODetail extends CommonBaseEntity implements Serializable {
 
     private String pd_inwhname;
 
-    private Integer pd_orderid;
+    private Long pd_orderid;
 
     private Integer pd_sdid;
 

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/ProdInOut.java

@@ -31,7 +31,7 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
 
     private String pi_pucode;
 
-    private Integer pi_said;
+    private Long pi_said;
 
     private String pi_sacode;
 
@@ -63,8 +63,11 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
 
     private String pi_address;
 
+    private Double pi_nettotal;
+
     private Date pi_auditdate;
 
-    private Date pi_auditman;
+    private String pi_auditman;
+
 
 }

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/ProdInOutList.java

@@ -66,11 +66,6 @@ public class ProdInOutList extends CommonBaseEntity{
 
     private String pi_address;
 
-    private Date pi_auditdate;
-
-    private Date pi_auditman;
-
-
     private Long pd_piid;
 
     private String pd_inoutno;
@@ -143,4 +138,10 @@ public class ProdInOutList extends CommonBaseEntity{
 
     private Long pd_ioid;
 
+    private Date pi_auditdate;
+
+    private String pi_auditman;
+
+    private Double pi_nettotal;
+
 }

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

@@ -82,15 +82,17 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             make.setCreatorId(BaseContextHolder.getUserId());
 
             getMapper().insertSelective(make);
-            //保存明细
-            for (MakeMaterial makeMaterial : makeMaterialList){
-                makeMaterial.setMm_maid(make.getId());
-                makeMaterial.setCompanyId(BaseContextHolder.getCompanyId());
-                makeMaterial.setCreatorId(BaseContextHolder.getUserId());
-                makeMaterial.setCreateTime(new Date());
+            if (makeMaterialList.size() > 0) {
+                //保存明细
+                for (MakeMaterial makeMaterial : makeMaterialList) {
+                    makeMaterial.setMm_maid(make.getId());
+                    makeMaterial.setCompanyId(BaseContextHolder.getCompanyId());
+                    makeMaterial.setCreatorId(BaseContextHolder.getUserId());
+                    makeMaterial.setCreateTime(new Date());
 
+                }
+                makeMaterialMapper.batchInsert(makeMaterialList);
             }
-            makeMaterialMapper.batchInsert(makeMaterialList);
             //记录LOG
             docBaseDTO = generateMsgObj(make.getId(), make.getMa_code());
             messageLogService.save(docBaseDTO);
@@ -103,23 +105,25 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
 
             List<MakeMaterial> updateItems = new ArrayList<MakeMaterial>();
             List<MakeMaterial> insertItems = new ArrayList<MakeMaterial>();
-            //更新从表
-            for (MakeMaterial makeMaterial : makeMaterialList){
-                if(makeMaterial.getId() == 0){
-                    makeMaterial.setCreatorId(BaseContextHolder.getUserId());
-                    makeMaterial.setCreateTime(new Date());
-                    makeMaterial.setCompanyId(BaseContextHolder.getCompanyId());
-                    insertItems.add(makeMaterial);
-                }else{
-                    makeMaterial.setUpdaterId(BaseContextHolder.getUserId());
-                    makeMaterial.setUpdateTime(new Date());
-                    makeMaterial.setCompanyId(BaseContextHolder.getCompanyId());
-                    updateItems.add(makeMaterial);
+            if (makeMaterialList.size() > 0) {
+                //更新从表
+                for (MakeMaterial makeMaterial : makeMaterialList) {
+                    if (makeMaterial.getId() == 0) {
+                        makeMaterial.setCreatorId(BaseContextHolder.getUserId());
+                        makeMaterial.setCreateTime(new Date());
+                        makeMaterial.setCompanyId(BaseContextHolder.getCompanyId());
+                        insertItems.add(makeMaterial);
+                    } else {
+                        makeMaterial.setUpdaterId(BaseContextHolder.getUserId());
+                        makeMaterial.setUpdateTime(new Date());
+                        makeMaterial.setCompanyId(BaseContextHolder.getCompanyId());
+                        updateItems.add(makeMaterial);
+                    }
                 }
+                //执行插入、更新
+                makeMaterialMapper.batchInsert(insertItems);
+                makeMaterialMapper.batchUpdate(updateItems);
             }
-            //执行插入、更新
-            makeMaterialMapper.batchInsert(insertItems);
-            makeMaterialMapper.batchUpdate(updateItems);
             //记录LOG
             docBaseDTO = generateMsgObj(make.getId(), make.getMa_code());
             messageLogService.update(docBaseDTO);

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

@@ -221,102 +221,22 @@
     DELETE FROM MAKEMATERIAL WHERE MM_MAID=#{id} AND COMPANYID={companyId}
   </delete>
   <insert id="batchInsert" parameterType="java.util.List">
-    <foreach collection="list" item="item" separator=",">
-      INSERT INTO MAKEMATERIAL
-      <trim prefix="(" suffix=")" suffixOverrides=",">
-        <if test="item.mm_maid != null" >
-          mm_maid,
-        </if>
-        <if test="item.mm_detno != null" >
-          mm_detno,
-        </if>
-        <if test="item.mm_prodid != null" >
-          mm_prodid,
-        </if>
-        <if test="item.mm_prodcode != null" >
-          mm_prodcode,
-        </if>
-        <if test="item.mm_whid != null" >
-          mm_whid,
-        </if>
-        <if test="item.mm_whcode != null" >
-          mm_whcode,
-        </if>
-        <if test="item.mm_price != null" >
-          mm_price,
-        </if>
-        <if test="item.mm_oneuseqty != null" >
-          mm_oneuseqty,
-        </if>
-        <if test="item.mm_qty != null" >
-          mm_qty,
-        </if>
-        <if test="item.mm_amount != null" >
-          mm_amount,
-        </if>
-        <if test="item.mm_repprodcode != null" >
-          mm_repprodcode,
-        </if>
-        <if test="item.mm_remark != null" >
-          mm_remark,
-        </if>
-        <if test="item.companyId != null" >
-          companyId,
-        </if>
-        <if test="item.updaterId != null" >
-          updaterId,
-        </if>
-        <if test="item.updateTime != null" >
-          updateTime,
-        </if>
-      </trim>
-      <trim prefix="values(" suffix=")" suffixOverrides=",">
-        <if test="item.mm_maid != null" >
-          #{item.mm_maid},
-        </if>
-        <if test="item.mm_detno != null" >
-          #{item.mm_detno,jdbcType=INTEGER},
-        </if>
-        <if test="item.mm_prodid != null" >
-          #{item.mm_prodid,jdbcType=INTEGER},
-        </if>
-        <if test="item.mm_prodcode != null" >
-          #{item.mm_prodcode,jdbcType=VARCHAR},
-        </if>
-        <if test="item.mm_whid != null" >
-          #{item.mm_whid,jdbcType=INTEGER},
-        </if>
-        <if test="item.mm_whcode != null" >
-          #{item.mm_whcode,jdbcType=VARCHAR},
-        </if>
-        <if test="item.mm_price != null" >
-          #{item.mm_price,jdbcType=DOUBLE},
-        </if>
-        <if test="item.mm_oneuseqty != null" >
-          #{item.mm_oneuseqty,jdbcType=DOUBLE},
-        </if>
-        <if test="item.mm_qty != null" >
-          #{item.mm_qty,jdbcType=DOUBLE},
-        </if>
-        <if test="item.mm_amount != null" >
-          #{item.mm_amount,jdbcType=DOUBLE},
-        </if>
-        <if test="item.mm_repprodcode != null" >
-          #{item.mm_repprodcode,jdbcType=VARCHAR},
-        </if>
-        <if test="item.mm_remark != null" >
-          #{item.mm_remark,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>
-      </trim>
+      INSERT INTO MAKEMATERIAL (mm_maid, mm_detno,
+      mm_prodid, mm_prodcode, mm_whid,
+      mm_whcode, mm_price, mm_oneuseqty,
+      mm_qty, mm_amount, mm_repprodcode,
+      mm_remark, companyId, updaterId,
+      updateTime)
+      VALUES
+    <foreach collection="list" item="item" index="index" open="" close="" separator=",">
+      (
+      #{item.mm_maid}, #{item.mm_detno,jdbcType=INTEGER},
+      #{item.mm_prodid,jdbcType=INTEGER}, #{item.mm_prodcode,jdbcType=VARCHAR}, #{item.mm_whid,jdbcType=INTEGER},
+      #{item.mm_whcode,jdbcType=VARCHAR}, #{item.mm_price,jdbcType=DOUBLE}, #{item.mm_oneuseqty,jdbcType=DOUBLE},
+      #{item.mm_qty,jdbcType=DOUBLE}, #{item.mm_amount,jdbcType=DOUBLE}, #{item.mm_repprodcode,jdbcType=VARCHAR},
+      #{item.mm_remark,jdbcType=VARCHAR}, #{item.companyId,jdbcType=INTEGER}, #{item.updaterId,jdbcType=INTEGER},
+      #{item.updateTime,jdbcType=TIMESTAMP}
+      )
     </foreach>
   </insert>
   <update id="batchUpdate" parameterType="com.usoftchina.saas.storage.po.MakeMaterial">

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/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:8570",
+            "urlPattern": "^\/api\/"
         }
     },
 

frontend/saas-web/app/model/document/bom.js → frontend/saas-web/app/model/document/bomdetail.js

@@ -1,13 +1,12 @@
-Ext.define('saas.model.document.bom', {
+Ext.define('saas.model.document.bomdetail', {
     extend: 'saas.model.Base',
     fields: [
         { name: 'id', type: 'int' },
-        { name: 'bd_id', type: 'int' },
         { name: 'bd_bomid', type: 'int' },
         { name: 'bd_detno', type: 'int' },
         { name: 'bd_sonid', type: 'int' },
         { name: 'bd_soncode', type: 'string' },
-        { name: 'bo_unit', type: 'string' },
+        { name: 'bd_unit', type: 'string' },
         { name: 'bd_baseqty', type: 'string' },
         { name: 'bd_replace', type: 'string' },
         { name: 'bd_remark', type: 'string' },

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/base/BasePanelController.js

@@ -7,7 +7,7 @@ Ext.define('saas.view.core.base.BasePanelController', {
 
     query: function() {
         var form = this.view;
-        var grid = form.down('core-baseform-gridpanel');
+        var grid = form.down('core-base-gridpanel');
         grid.condition = '';
         var fields = form.searchField.map(f => f.name);
         var items = [];

frontend/saas-web/app/view/core/base/GridPanel.js

@@ -153,11 +153,11 @@ Ext.define('saas.view.core.base.GridPanel', {
                 })
                 .then(function() {
                     showToast('操作成功');
+                    grid.store.load();
                 })
                 .catch(function(response) {
                     showToast('操作失败');
                 });
-                grid.store.load();
         }else{
             showToast('请勾选至少一条明细。');
         }

frontend/saas-web/app/view/core/form/FormPanel.js

@@ -261,13 +261,8 @@ Ext.define('saas.view.core.form.FormPanel', {
         var detailGrids = me.query('detailGridField');
 
         Ext.Array.each(detailGrids, function(g) {
-            var columns = g.columns;
-            Ext.Array.each(columns, function(c) {
-                var e = c.getEditor();
-                if(e) {
-                    typeof e.setDisabled == 'function' && e.setDisabled(!able);
-                }
-            });
+
+            g.setGridDisabled(able);
         });
 
         Ext.Array.each(items, function(item) {

frontend/saas-web/app/view/core/form/field/DetailGridField.js

@@ -25,6 +25,7 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
 
     showIndex: true,
     configUrl: '',
+    editable: true,
 
     initComponent: function() {
         var me = this;
@@ -33,7 +34,9 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
 
         addRows = function(id) {
             var grid = Ext.getCmp(id);
-            grid.addDetail(0);
+            if(grid.editable) {
+                grid.addDetail(0);
+            }
         };
 
         Ext.apply(me, {
@@ -46,8 +49,11 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
                 emptyText: '<div style="width: 100%; text-align: center; cursor: pointer; color: green;" class="fa fa-plus" title="新增行" onclick="addRows(\'' + me.id + '\')"></div>',
             },
             listeners: {
-                itemmouseenter: function(grid, record, item, index, e, eOpts) {
-                    var lockedItems = grid.el.dom.parentElement.parentElement.getElementsByClassName('x-grid-scrollbar-clipper-locked')[0].getElementsByClassName('x-grid-item');
+                itemmouseenter: function(view, record, item, index, e, eOpts) {
+                    if(!view.up('detailGridField').editable) {
+                        return;
+                    }
+                    var lockedItems = view.el.dom.parentElement.parentElement.getElementsByClassName('x-grid-scrollbar-clipper-locked')[0].getElementsByClassName('x-grid-item');
                     var currentLockedItem = lockedItems[index];
                     var textItem = currentLockedItem.getElementsByClassName('text')[0];
                     var iconsItem = currentLockedItem.getElementsByClassName('icons')[0];
@@ -55,8 +61,11 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
                     textItem.style.display = 'none';
                     iconsItem.style.display = 'flex';
                 },
-                itemmouseleave: function(grid, record, item, index, e, eOpts) {
-                    var lockedItems = grid.el.dom.parentElement.parentElement.getElementsByClassName('x-grid-scrollbar-clipper-locked')[0].getElementsByClassName('x-grid-item');
+                itemmouseleave: function(view, record, item, index, e, eOpts) {
+                    if(!view.up('detailGridField').editable) {
+                        return;
+                    }
+                    var lockedItems = view.el.dom.parentElement.parentElement.getElementsByClassName('x-grid-scrollbar-clipper-locked')[0].getElementsByClassName('x-grid-item');
                     var currentLockedItem = lockedItems[index];
                     var textItem = currentLockedItem.getElementsByClassName('text')[0];
                     var iconsItem = currentLockedItem.getElementsByClassName('icons')[0];
@@ -64,7 +73,7 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
                     textItem.style.display = 'block';
                     iconsItem.style.display = 'none';
                 },
-                cellclick: function(grid, td, cellIndex, record, tr, rowIndex, e, eOpts) {
+                cellclick: function(view, td, cellIndex, record, tr, rowIndex, e, eOpts) {
                     var target = e.target;
                     var detno = record.get(me.detnoColumn);
 
@@ -151,8 +160,12 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
     },
 
     addDetail: function(v) {
-        var me = this,
-        detnoColumn = me.detnoColumn,
+        var me = this;
+        var me = this;
+        if(!me.editable) {
+            return;
+        }
+        var detnoColumn = me.detnoColumn,
         store = me.getStore(),
         records = store.getData().items,
         selectedRecord = records.find(function(r) {
@@ -177,8 +190,11 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
     },
 
     deleteDetail: function(v) {
-        var me = this,
-        detnoColumn = me.detnoColumn,
+        var me = this;
+        if(!me.editable) {
+            return;
+        }
+        var detnoColumn = me.detnoColumn,
         store = me.getStore(),
         records = store.getData().items,
         selectedRecord = records.find(function(r) {
@@ -210,8 +226,12 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
     },
 
     swapUp: function() {
-        var me = this,
-        store = me.getStore(),
+        var me = this;
+        var me = this;
+        if(!me.editable) {
+            return;
+        }
+        var store = me.getStore(),
         record = me.selModel.lastSelected,
         selectedIdx = store.indexOf(record);
 
@@ -219,8 +239,12 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
     },
 
     swapDown: function() {
-        var me = this,
-        store = me.getStore(),
+        var me = this;
+        var me = this;
+        if(!me.editable) {
+            return;
+        }
+        var store = me.getStore(),
         record = me.selModel.lastSelected,
         selectedIdx = store.indexOf(record);
         
@@ -250,6 +274,19 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
             //聚焦目标行
             me.selModel.select(to);
         }
+    },
+    setGridDisabled: function(able) {
+        var me = this,
+        columns = me.columns;
+
+        me.editable = able;
+
+        Ext.Array.each(columns, function(c) {
+            var e = c.getEditor();
+            if(e) {
+                typeof e.setDisabled == 'function' && e.setDisabled(!able);
+            }
+        });
     }
 
 });

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

@@ -110,7 +110,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                 },
                 items: ['->', {
                     text: '新增',
-                    handler: me.onAddMore
+                    handler: 'onAddClick'
                 }, {
                     text: '审核',
                     xtype: 'button',
@@ -215,11 +215,6 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
             return c.dataIndex;
         });
     },
-    onAddMore: function (me) {
-        var grid = me.up('grid'),
-        id = grid.xtype + '_add';
-        openTab(grid.addXtype,'新增'+grid.addTitle,id)
-    },
     onAudit: function(me){
         console.log('审核');
         me.up('grid').vastOperation("batchAudit");

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

@@ -32,6 +32,13 @@ Ext.define('saas.view.core.query.QueryPanelController', {
         viewModel.set('moreQuery', true);
         queryGrid.store.loadPage(1);
     },
+    onAddClick: function() {
+        var me = this,
+        queryPanel = me.getView(),
+        gridPanel = queryPanel.down('core-query-querygridpanel'),
+        id = gridPanel.addXtype + '_add';
+        openTab(gridPanel.addXtype,'新增'+gridPanel.addTitle,id)
+    },
     onReSetClick:function(btn){
         btn.ownerCt.ownerCt.reset();
     },

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

@@ -5,12 +5,50 @@ Ext.define('saas.view.document.bom.BasePanel', {
     controller: 'document-bom-basepanel',
     viewModel: 'document-bom-basepanel',
 
+    searchField:[],
+
     //字段属性
+    _formXtype:'document-bom-formpanel',
     _title:'BOM资料',
-    _dataUrl:basePath + 'document/vendor/getVendorsByCondition',
-    _saveUrl:basePath + 'document/vendor/save',
-    _deleteUrl:basePath + 'document/vendor/delete',
-
+    // _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',
+        dataUrl: '/api/document/bom/list',
+        columns : [{
+            text : "id", 
+            width : 0, 
+            dataIndex : "id", 
+            xtype : "numbercolumn",   
+        },{
+            text : "母件id", 
+            width : 0, 
+            dataIndex : "bo_motherid", 
+            xtype : "numbercolumn",   
+        },{
+            text : "母件编号", 
+            width : 200.0, 
+            dataIndex : "bo_mothercode", 
+        }, 
+        {
+            text : "母件名称", 
+            dataIndex : "bo_mothername", 
+            width : 120.0, 
+        }, 
+        {
+            text : "BOM状态", 
+            dataIndex : "bo_status", 
+            width : 120.0, 
+        }, 
+        {
+            text : "BOM版本", 
+            dataIndex : "bo_version", 
+            width : 120.0, 
+        }]
+    },
 
 });

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

@@ -0,0 +1,65 @@
+Ext.define('saas.view.document.bom.FormController', {
+    extend: 'saas.view.core.form.FormPanelController',
+    alias: 'controller.document-bom-formpanel',
+    
+    init: function (form) {
+        var me = this;
+        this.control({});
+    },
+
+    auditBtnClick: function() {
+        var me = this,
+        form = me.getView(),
+        statusCodeField = form._statusCodeField,
+        viewModel = me.getViewModel(),
+        status = viewModel.data[statusCodeField];
+        status == 'OPEN' ? me.unAudit() : me.audit();
+    },
+
+    audit: function(){
+        var me = this,
+        form = this.getView(),
+        viewModel = me.getViewModel();
+        
+        me.BaseUtil.request({
+            url: form._openUrl+'/'+viewModel.data.id,
+            params: '',
+            method: 'POST',
+        })
+        .then(function(localJson) {
+            if(localJson.success){
+                showToast('启用成功');
+                form.initId = localJson.data.id;
+                form.FormUtil.loadData(form);
+                viewModel.set('base.editable', false);
+            }
+        })
+        .catch(function(res) {
+            console.error(res);
+            showToast('启用失败: ' + res.message);
+        });
+    },
+    unAudit: function() {
+        var me = this,
+        form = this.getView(),
+        viewModel = me.getViewModel();
+        
+        me.BaseUtil.request({
+            url: form._closeUrl+'/'+viewModel.data.id,
+            params: '',
+            method: 'POST',
+        })
+        .then(function(localJson) {
+            if(localJson.success){
+                showToast('禁用成功');
+                form.initId = localJson.data.id;
+                form.FormUtil.loadData(form);
+                viewModel.set('base.editable', false);
+            }
+        })
+        .catch(function(res) {
+            console.log(res);
+            showToast('禁用失败: ' + res.message);
+        });
+    }
+});

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

@@ -0,0 +1,17 @@
+Ext.define('saas.view.document.bom.FormModel', {
+    extend: 'saas.view.core.form.FormPanelModel',
+    alias: 'viewmodel.document-bom-formpanel',
+
+    data: {
+        id: 0
+    },
+
+    formulas:{
+        showAuditBtn:{
+            bind:'{id}',
+            get:function(value){
+                return !value;
+            }
+        }
+    }
+});

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

@@ -0,0 +1,162 @@
+Ext.define('saas.view.document.bom.FormPanel', {
+    extend: 'saas.view.core.form.FormPanel',
+    xtype: 'document-bom-formpanel',
+
+    controller: 'document-bom-formpanel',
+    viewModel: 'document-bom-formpanel',
+    
+    caller:'Bom',
+
+    //字段属性
+    _title:'客户资料',
+    _idField: 'id',
+    _codeField: 'bo_mothercode',
+    _statusField: 'bo_status',
+    _statusCodeField: 'bo_statuscode',
+    _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: [{
+        xtype: 'hidden',
+        name: 'id',
+        fieldLabel: 'id',
+        allowBlank: true,
+        columnWidth: 0.25
+    },{
+        xtype: 'hidden',
+        name: 'bo_motherid',
+        fieldLabel: '母件id',
+        allowBlank: true,
+        columnWidth: 0.25
+    },{
+        xtype: 'textfield',
+        name: 'bo_mothername',
+        fieldLabel: 'BOM名称',
+        allowBlank: false,
+        columnWidth: 0.25
+    },{
+        xtype: 'textfield',
+        name: 'bo_mothercode',
+        fieldLabel: 'BOM编号',
+        allowBlank: true,
+        columnWidth: 0.25
+    },{
+        xtype: 'textfield',
+        name: 'bo_status',
+        fieldLabel: 'BOM状态',
+        allowBlank: true,
+        columnWidth: 0.25
+    },{
+        xtype: 'hidden',
+        name: 'bo_statuscode',
+        fieldLabel: '状态码',
+        allowBlank: true,
+        columnWidth: 0.25
+    },{
+        format : "Y-m-d",
+        xtype : "datefield", 
+        name : "createTime", 
+        fieldLabel : "创建时间", 
+        allowBlank : true, 
+        columnWidth : 0.25
+    },{  
+        format : "Y-m-d",
+        xtype : "datefield", 
+        name : "updateTime", 
+        fieldLabel : "更新时间", 
+        allowBlank : true, 
+        columnWidth : 0.25
+    }, {
+        xtype : "detailGridField", 
+        detnoColumn:  'bd_detno',
+        storeModel:'saas.model.document.bomdetail',
+        deleteDetailUrl:'/api/document/bom/deleteDetail/',
+        columns : [
+            {
+                text : "ID", 
+                dataIndex : "id", 
+                width : 0, 
+                xtype : "numbercolumn"
+            },
+            {
+                text : "关联ID", 
+                dataIndex : "bd_bomid", 
+                width : 0, 
+                xtype : "numbercolumn"
+            },
+            {
+                text : "子件编号", 
+                editor : {
+                    xtype : "textfield"
+                },
+                dataIndex : "bd_soncode", 
+                width : 120.0, 
+                xtype : "", 
+                items : null
+            },
+            {
+                text : "单位", 
+                editor : {
+                    xtype : "textfield"
+                },
+                dataIndex : "bd_unit", 
+                width : 120.0, 
+                xtype : "", 
+                items : null
+            },
+            {
+                text : "单位用量", 
+                editor : {
+                    xtype : "textfield"
+                },
+                dataIndex : "bd_baseqty", 
+                width : 120.0, 
+                xtype : "", 
+                items : null
+            },
+            {
+                text : "替代料", 
+                editor : {
+                    xtype : "textfield"
+                },
+                dataIndex : "bd_replace", 
+                width : 120.0, 
+                xtype : "", 
+                items : null
+            }]
+    }],
+
+    /**
+     * 一些初始化viewModel的方法
+     */
+    initViewModel: function() {
+        var me = this,
+        codeField = me._codeField,
+        statusField = me._statusField,
+        statusCodeField = me._statusCodeField,
+        viewModel = me.getViewModel();
+        
+        viewModel.set(codeField, '');
+        viewModel.set('createTime', new Date());
+        viewModel.set('updateTime', new Date());
+
+        if(statusCodeField) {
+            var o = {};
+            o['auditBtnText'] = {
+                bind: '{' + statusCodeField + '}',
+                get: function(value) {
+                    viewModel.set(statusField, value == 'OPEN' ? '启用' : '禁用');
+                    return value == 'OPEN' ? '禁用' : '启用'
+                }
+            };
+            viewModel.setFormulas(o);
+            viewModel.set(statusCodeField, "OPEN");
+        }else {
+            viewModel.set('auditBtnText', "禁用");
+        }
+    }
+});

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,15 +43,15 @@ 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',
-        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){
@@ -149,7 +149,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", 
@@ -240,7 +240,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'
         },
         storeinformation:{
             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,14 +44,14 @@ 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',
-        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,16 +42,16 @@ 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',
-        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/MainContainerWrap.js

@@ -29,6 +29,11 @@ Ext.define('saas.view.main.MainContainerWrap', {
                 closable: true,
                 margin: 10
             },
+            plugins: [new Ext.ux.TabCloseMenu({
+                closeTabText: '关闭',
+                closeAllTabsText: '关闭全部',
+                closeOthersTabsText: '关闭其他'
+            })],
             items: [
                 {
                     xtype: 'home',

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,11 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
         xtype : "detailGridField", 
         storeModel:'saas.model.money.FundTransfer',
         detnoColumn:  'ftd_detno',
+<<<<<<< HEAD
         deleteDetailUrl:basePath+'fundtransfer/deleteItem/',
+=======
+        _deleteDetailUrl:'/api/fundtransfer/deleteItem/',
+>>>>>>> 12e93723100fb3a14b86475ac9edfc82a3c9e52e
         columnWidth : 1,
         columns : [
             {

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

@@ -20,7 +20,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
         addTitle: '其它收入单',
         addXtype: 'money-fundtransfer-formpanel',
         defaultCondition:'',
-        baseVastUrl: basePath+'money/fundtransfer/',
+        baseVastUrl: '/api/money/fundtransfer/',
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',

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

@@ -15,9 +15,15 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
      _statusField: 'or_status',
      _statusCodeField: 'or_statuscode',
      _relationColumn: 'ord_orid',
+<<<<<<< HEAD
      _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/', 
+>>>>>>> 12e93723100fb3a14b86475ac9edfc82a3c9e52e
      initId:0,
 
     defaultItems: [{
@@ -53,7 +59,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 +84,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 +96,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){

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

@@ -45,7 +45,12 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         addTitle: '其它收入单',
         addXtype: 'money-othreceipts-formpanel',
         defaultCondition:'',
+<<<<<<< HEAD
         baseVastUrl: basePath+'money/othreceipts/',
+=======
+       // baseVastUrl: '/api/money/othreceipts/',
+        baseVastUrl: 'http://192.168.253.129:8940/othreceipts/',
+>>>>>>> 12e93723100fb3a14b86475ac9edfc82a3c9e52e
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',

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

@@ -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){

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

@@ -45,7 +45,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         addTitle: '其它支出单',
         addXtype: 'money-othspendings-formpanel',
         defaultCondition:'',
-        baseVastUrl: basePath+'money/othspendings/',
+        baseVastUrl: '/api/money/othspendings/',
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',

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,10 @@ 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/',
+    _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 +88,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 +122,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',
+    _deleteUrl:'/api/purchase/prodinout/delete',
+    _baseVastUrl:'/api/purchase/prodinout/',
+    _turnOutUrl:'/api/purchase/prodinout/turnProdOut/',
 
     // _relationColumn: 'pd_piid',
     // _readUrl:'http://localhost:8800/prodinout/read/',
@@ -47,13 +47,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         fieldLabel: 'id',
         allowBlank: true,
         columnWidth: 0
-    }, {
-        xtype : "textfield", 
-        name : "pi_inoutno", 
-        bind : "{pi_inoutno}", 
-        fieldLabel : "验收单号", 
-        allowBlank : true, 
-        columnWidth : 0.25
     },{
         xtype : "textfield", 
         name : "pi_class", 
@@ -113,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-storeinformation',
                         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/',
@@ -41,13 +41,6 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
         fieldLabel: 'id',
         allowBlank: true,
         columnWidth: 0
-    }, {
-        xtype : "textfield", 
-        name : "pi_inoutno", 
-        bind : "{pi_inoutno}", 
-        fieldLabel : "验收单号", 
-        allowBlank : true, 
-        columnWidth : 0.25
     },{
         xtype : "textfield", 
         name : "pi_class", 
@@ -108,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-storeinformation',
                         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", 

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:[