产品出库

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/PtsMachine.java

@@ -1,5 +1,8 @@
 package com.iamberry.rst.core.pts;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -11,6 +14,8 @@ public class PtsMachine implements Serializable{
     private Integer machineId;//机器id
     private String  machineQrcode;//二维码
     private String machineBarcode;//条形码
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date machineSalesDate;//销售日期
     private Integer machineSalesState;//销售状态
     private Integer machineProduceType;//产品类型
@@ -36,6 +41,8 @@ public class PtsMachine implements Serializable{
 
     private String  machineLine; //拉线
 
+    private Integer machineSalesCompanyId; //销售公司主键
+
     public Integer getMachineId() {
         return machineId;
     }
@@ -227,4 +234,12 @@ public class PtsMachine implements Serializable{
     public void setMachineHardwareVersionName(String machineHardwareVersionName) {
         this.machineHardwareVersionName = machineHardwareVersionName;
     }
+
+    public Integer getMachineSalesCompanyId() {
+        return machineSalesCompanyId;
+    }
+
+    public void setMachineSalesCompanyId(Integer machineSalesCompanyId) {
+        this.machineSalesCompanyId = machineSalesCompanyId;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/PtsSalesCompany.java

@@ -0,0 +1,72 @@
+package com.iamberry.rst.core.pts;
+
+import javax.xml.crypto.Data;
+import java.io.Serializable;
+
+/**
+ * 销售公司实体类
+ */
+public class PtsSalesCompany implements Serializable {
+
+    private static final long serialVersionUID = 7575683130625220185L;
+
+    private Integer salesCompanyId; //销售公司id
+
+    private String salesCompanyName; //销售公司名称
+
+    private String salesCompanyAbbreviation; //销售公司简称
+
+    private String salesCompanyAddress; //销售公司地址
+
+    private Data salesCompanyCreateTime; //创建时间
+
+    private Data salesCompanyUpdateTime; //修改时间
+
+    public Integer getSalesCompanyId() {
+        return salesCompanyId;
+    }
+
+    public void setSalesCompanyId(Integer salesCompanyId) {
+        this.salesCompanyId = salesCompanyId;
+    }
+
+    public String getSalesCompanyName() {
+        return salesCompanyName;
+    }
+
+    public void setSalesCompanyName(String salesCompanyName) {
+        this.salesCompanyName = salesCompanyName;
+    }
+
+    public String getSalesCompanyAbbreviation() {
+        return salesCompanyAbbreviation;
+    }
+
+    public void setSalesCompanyAbbreviation(String salesCompanyAbbreviation) {
+        this.salesCompanyAbbreviation = salesCompanyAbbreviation;
+    }
+
+    public String getSalesCompanyAddress() {
+        return salesCompanyAddress;
+    }
+
+    public void setSalesCompanyAddress(String salesCompanyAddress) {
+        this.salesCompanyAddress = salesCompanyAddress;
+    }
+
+    public Data getSalesCompanyCreateTime() {
+        return salesCompanyCreateTime;
+    }
+
+    public void setSalesCompanyCreateTime(Data salesCompanyCreateTime) {
+        this.salesCompanyCreateTime = salesCompanyCreateTime;
+    }
+
+    public Data getSalesCompanyUpdateTime() {
+        return salesCompanyUpdateTime;
+    }
+
+    public void setSalesCompanyUpdateTime(Data salesCompanyUpdateTime) {
+        this.salesCompanyUpdateTime = salesCompanyUpdateTime;
+    }
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/PtsSalesCompanyService.java

@@ -0,0 +1,19 @@
+package com.iamberry.rst.faces.pts;
+
+import com.iamberry.rst.core.pts.PtsSalesCompany;
+
+import java.util.List;
+
+/**
+ * 销售公司
+ */
+public interface PtsSalesCompanyService {
+
+    /**
+     * 获取销售公司集合
+     * @param ptsSalesCompany
+     * @return
+     */
+    List<PtsSalesCompany> listPtsSalesCompany(PtsSalesCompany ptsSalesCompany);
+
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/PtsSalesCompanyServiceImpl.java

@@ -0,0 +1,22 @@
+package com.iamberry.rst.service.pts;
+
+import com.iamberry.rst.core.pts.PtsSalesCompany;
+import com.iamberry.rst.faces.pts.PtsSalesCompanyService;
+import com.iamberry.rst.service.pts.mapper.PtsSalesCompanyMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PtsSalesCompanyServiceImpl implements PtsSalesCompanyService {
+
+    @Autowired
+    private PtsSalesCompanyMapper ptsSalesCompanyMapper;
+
+
+    @Override
+    public List<PtsSalesCompany> listPtsSalesCompany(PtsSalesCompany ptsSalesCompany) {
+        return ptsSalesCompanyMapper.listPtsSalesCompany(ptsSalesCompany);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/PtsSalesCompanyMapper.java

@@ -0,0 +1,19 @@
+package com.iamberry.rst.service.pts.mapper;
+
+import com.iamberry.rst.core.pts.PtsSalesCompany;
+
+import java.util.List;
+
+/**
+ * 销售公司
+ * Created by wangxiaoming on 2017/8/28.
+ */
+public interface PtsSalesCompanyMapper {
+    /**
+     * 获取销售公司集合
+     * @param ptsSalesCompany
+     * @return
+     */
+    List<PtsSalesCompany> listPtsSalesCompany(PtsSalesCompany ptsSalesCompany);
+
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/machineMapper.xml

@@ -44,6 +44,9 @@
             <if test="machineProduceId != null and machineProduceId != ''" >
                 machine_produce_id = #{machineProduceId}
             </if>
+            <if test="machineSalesCompanyId != null and machineSalesCompanyId != ''" >
+                machine_sales_company_id = #{machineSalesCompanyId}
+            </if>
         </set>
         <where>
             <if test="machineId != null and machineId != ''">

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/produceMapper.xml

@@ -220,7 +220,7 @@
                 produce_feature = #{produceFeature},
             </if>
             <if test="produceRemake !=null and produceRemake !=''">
-                produce_remake = #{produceRemake},
+                produce_remake = #{produceRemake}
             </if>
         </set>
         WHERE

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/ptsSalesCompanyMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.iamberry.rst.service.pts.mapper.PtsSalesCompanyMapper">
+
+    <select id="listPtsSalesCompany" parameterType="PtsSalesCompany" resultType="PtsSalesCompany">
+        SELECT
+            t.sales_company_id,
+            t.sales_company_name,
+            t.sales_company_abbreviation,
+            t.sales_company_address,
+            t.sales_company_create_time,
+            t.sales_company_update_time
+        FROM
+            tb_rst_pts_sales_company t
+    </select>
+</mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java

@@ -1,15 +1,8 @@
 package com.iamberry.rst.controllers.pts;
 
-import com.iamberry.rst.core.order.Order;
-import com.iamberry.rst.core.order.RentType;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.pts.*;
-import com.iamberry.rst.core.pts.PtsEmployee;
-import com.iamberry.rst.core.pts.ProduceProcess;
-import com.iamberry.rst.core.pts.PtsMachine;
-import com.iamberry.rst.core.pts.PtsMachineLogs;
-import com.iamberry.rst.core.pts.PtsMachineStatistics;
 import com.iamberry.rst.core.tools.QRCJson;
 import com.iamberry.rst.core.tools.WeixinUtil;
 import com.iamberry.rst.faces.pts.*;
@@ -30,8 +23,10 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
 
 /**
  * Created by LJK on 2017/8/29.
@@ -58,6 +53,9 @@ public class AdminMachineController {
     @Autowired
     private MachinePartsService machinePartsService;
 
+    @Autowired
+    private PtsSalesCompanyService ptsSalesCompanyService;
+
     /**
      * 查询机器列表
      *
@@ -105,7 +103,7 @@ public class AdminMachineController {
         }
         //查询最新一条机器id
         Integer machineId = machineService.maxMachineId();
-        mv.addObject("machineId", machineId == null? 0:machineId);
+        mv.addObject("machineId", machineId == null ? 0 : machineId);
         sb.append("&pageTotal=").append(total).append("&pageNO=");
         mv.addObject("page", pagedResult);
         mv.addObject("url", sb.toString());
@@ -237,26 +235,26 @@ public class AdminMachineController {
         List<PtsMachineLogs> machineLogsList = machineService.listMachineLogs(machineId);
 
         PtsBom ptsBom = new PtsBom();
-        if(ptsMachine.getMachineBomId() != null && ptsMachine.getMachineBomId() != 0){
+        if (ptsMachine.getMachineBomId() != null && ptsMachine.getMachineBomId() != 0) {
             //获取bom单
             ptsBom.setBomId(ptsMachine.getMachineBomId());
             ptsBom = ptsBomService.getPtsBomDetails(ptsBom);
         }
 
         PtsBatch ptsBatch = new PtsBatch();
-        if(ptsMachine.getMachineBatchId() != null && ptsMachine.getMachineBatchId() != 0){
+        if (ptsMachine.getMachineBatchId() != null && ptsMachine.getMachineBatchId() != 0) {
             ptsBatch.setBatchId(ptsMachine.getMachineBatchId());
             ptsBatch = ptsBatchService.getPtsBatch(ptsBatch);
         }
 
         PtsMachineVersion ptsMachineVersion = new PtsMachineVersion();
-        if(ptsMachine.getMachineSoftwareVersion() != null && ptsMachine.getMachineSoftwareVersion() != 0){
+        if (ptsMachine.getMachineSoftwareVersion() != null && ptsMachine.getMachineSoftwareVersion() != 0) {
             ptsMachineVersion.setMachineVersionId(ptsMachine.getMachineSoftwareVersion());
             ptsMachineVersion = machineVersionService.getMachineVersion(ptsMachineVersion);
         }
 
         Produce produce = new Produce();
-        if(ptsMachineVersion != null && ptsMachineVersion.getProduceId() != null){
+        if (ptsMachineVersion != null && ptsMachineVersion.getProduceId() != null) {
             produce.setProduceId(ptsBatch.getProduceId());
             produce = produceService.getProduce(produce);
         }
@@ -306,7 +304,7 @@ public class AdminMachineController {
         if (produceId == null || produceId.equals("")) {
             produce = produceService.getProduceByOne();//默认为第一个产品
 
-        }else{
+        } else {
             produce.setProduceId(Integer.valueOf(produceId));
             produce = produceService.getProduce(produce);
         }
@@ -349,10 +347,10 @@ public class AdminMachineController {
         mv.addObject("machineNum", numbers.getMachineCount());
         double percentage = 0.0;
         /*流程异常百分比*/
-        if(numbers.getMachineAbnormality() == null){
+        if (numbers.getMachineAbnormality() == null) {
             /*机器异常总数*/
             mv.addObject("machineAbnormality", 0);
-        }else{
+        } else {
             percentage = (double) numbers.getMachineAbnormality() / (double) numbers.getMachineCount() * 100;
         }
         NumberFormat nf = new DecimalFormat("0.0 ");
@@ -367,7 +365,7 @@ public class AdminMachineController {
         List<ProduceProcess> processList = produceService.listProduceProcess(produceProcess);
         mv.addObject("processList", processList);
         //查询第一条的工序值 默认选择第一条工序
-        if(processList.size() > 0){
+        if (processList.size() > 0) {
             List<PtsMachineStatistics> nodeCountList = machineService.nodeNormalByPrduceId(processList.get(0).getProcessId());
             if (nodeCountList.size() > 0) {
                 JSONObject json = new JSONObject();
@@ -471,18 +469,18 @@ public class AdminMachineController {
         String num = null;
         for (int i = 0; i < Integer.valueOf(number); i++) {
             machineNumber = machineNumber + i;
-            switch(String.valueOf(machineNumber+1).length()){
+            switch (String.valueOf(machineNumber + 1).length()) {
                 case 0:
                     num = "0001";
                     break;
                 case 1:
-                    num = "000"+String.valueOf(machineNumber);
+                    num = "000" + String.valueOf(machineNumber);
                     break;
                 case 2:
-                    num = "00"+String.valueOf(machineNumber);
+                    num = "00" + String.valueOf(machineNumber);
                     break;
                 case 3:
-                    num = "0"+String.valueOf(machineNumber);
+                    num = "0" + String.valueOf(machineNumber);
                     break;
                 case 4:
                     num = String.valueOf(machineNumber);
@@ -492,7 +490,7 @@ public class AdminMachineController {
             QRCJson qrc = WeixinUtil.createQrcode(json);
             PtsMachine ptsMachine = new PtsMachine();
             ptsMachine.setMachineQrcode(qrc.getUrl());//二维码
-            ptsMachine.setMachineBarcode(berQrcode+num);//条形码
+            ptsMachine.setMachineBarcode(berQrcode + num);//条形码
             ptsMachine.setMachineStatus(1);//机器状态
             ptsMachine.setMachineProducedTime(new Date());//生产时间
             ptsMachine.setMachineIsPrint(1);//是否打印1:未打印2:已打印
@@ -520,55 +518,56 @@ public class AdminMachineController {
     private String productModel = "1X";//产品型号
     private String productFeatures = "A";//产品特性
     private String softwareVersion = "30";//软件版本
+
     //生成条形码
-    public String generationBarCode(Produce produce){
+    public String generationBarCode(Produce produce) {
         Calendar cal = Calendar.getInstance();
         int year = cal.get(Calendar.YEAR);
         int month = cal.get(Calendar.MONTH) + 1;
 
         String months = String.valueOf(month);
-        if(month < 10){
-            months = "0"+months;
+        if (month < 10) {
+            months = "0" + months;
         }
         productModel = produce.getProduceModel();
         productFeatures = produce.getProduceFeature();
         //拼接
-        String barcode = productModel+productFeatures+softwareVersion+String.valueOf(year).substring(2,4)+months;
+        String barcode = productModel + productFeatures + softwareVersion + String.valueOf(year).substring(2, 4) + months;
         return barcode;
     }
 
     /**
      * 进入添加翻新机界面
-     * **/
+     **/
     @RequiresPermissions("machine:add:batch")
     @RequestMapping("/_to_add_renovation")
-    public ModelAndView toAddRenovationMachine(){
+    public ModelAndView toAddRenovationMachine() {
         ModelAndView mv = new ModelAndView("pts/machine/addRenovationMachine");
         //查询所有状态为可用的批次
-        List<PtsBatch>  listptsBatch = ptsBatchService.listPtsBatchByStatus();
-        mv.addObject("listptsBatch",listptsBatch);
+        List<PtsBatch> listptsBatch = ptsBatchService.listPtsBatchByStatus();
+        mv.addObject("listptsBatch", listptsBatch);
         //查询所有软件版本
         PtsMachineVersion ptsMachineVersion = new PtsMachineVersion();
         ptsMachineVersion.setMachineVersionType(1);
         List<PtsMachineVersion> ListVersion = machineVersionService.listMachineVersion(ptsMachineVersion);
-        mv.addObject("listVersion",ListVersion);
+        mv.addObject("listVersion", ListVersion);
         //根据第一个批次查询所有bom
-        if(listptsBatch.size() > 0){
+        if (listptsBatch.size() > 0) {
             PtsBom ptsBom = new PtsBom();
             ptsBom.setBomId(listptsBatch.get(0).getBomId());
             List<PtsBom> listBom = ptsBomService.listBom(ptsBom);
-            mv.addObject("listBom",listBom);
+            mv.addObject("listBom", listBom);
         }
         return mv;
     }
 
     /**
      * 根据产品id获取所有bom
-     * **/
+     **/
     @ResponseBody
     @RequiresPermissions("machine:add:batch")
     @RequestMapping("/select_bom")
-    public ResponseJson selectBatchByProduceId(HttpServletRequest request,Integer batchId){
+    public ResponseJson selectBatchByProduceId(HttpServletRequest request, Integer batchId) {
         ResponseJson rj = new ResponseJson();
         if (batchId == null || batchId.equals("")) {
             rj.setReturnCode(500);
@@ -581,18 +580,18 @@ public class AdminMachineController {
         PtsBom ptsBom = new PtsBom();
         ptsBom.setBomId(ptsBatch.getBomId());
         List<PtsBom> listBom = ptsBomService.listBom(ptsBom);
-        rj.addResponseKeyValue("listBom",listBom);
+        rj.addResponseKeyValue("listBom", listBom);
         rj.setReturnCode(200);
         return rj;
     }
 
     /**
      * 添加翻新机
-     * **/
+     **/
     @ResponseBody
     @RequiresPermissions("machine:add:batch")
     @RequestMapping("/add_renovationMachine")
-    public ResponseJson addRenovationMachine(HttpServletRequest request,Integer batchId,Integer versionId,Integer bomId,Integer number){
+    public ResponseJson addRenovationMachine(HttpServletRequest request, Integer batchId, Integer versionId, Integer bomId, Integer number) {
         ResponseJson rj = new ResponseJson();
         if (batchId == null || versionId == null || bomId == null) {
             rj.setReturnCode(500);
@@ -608,7 +607,7 @@ public class AdminMachineController {
         PtsBom ptsBom = new PtsBom();
         ptsBom.setBomId(bomId);
         ptsBom = ptsBomService.getPtsBom(ptsBom);
-        if(number == null || number < 1){
+        if (number == null || number < 1) {
             number = ptsBatch.getBatchQuantity();
         }
         ArrayList<PtsMachine> ptsList = new ArrayList<PtsMachine>();
@@ -622,18 +621,18 @@ public class AdminMachineController {
         String num = null;
         for (int i = 0; i < number; i++) {
             machineNumber++;
-            switch(String.valueOf(machineNumber).length()){
+            switch (String.valueOf(machineNumber).length()) {
                 case 0:
                     num = "0001";
                     break;
                 case 1:
-                    num = "000"+String.valueOf(machineNumber);
+                    num = "000" + String.valueOf(machineNumber);
                     break;
                 case 2:
-                    num = "00"+String.valueOf(machineNumber);
+                    num = "00" + String.valueOf(machineNumber);
                     break;
                 case 3:
-                    num = "0"+String.valueOf(machineNumber);
+                    num = "0" + String.valueOf(machineNumber);
                     break;
                 case 4:
                     num = String.valueOf(machineNumber);
@@ -643,7 +642,7 @@ public class AdminMachineController {
             QRCJson qrc = WeixinUtil.createQrcode(json);
             PtsMachine ptsMachine = new PtsMachine();
             ptsMachine.setMachineQrcode(qrc.getUrl());//二维码
-            ptsMachine.setMachineBarcode(berQrcode+num);//条形码
+            ptsMachine.setMachineBarcode(berQrcode + num);//条形码
             ptsMachine.setMachineStatus(1);//机器状态
             ptsMachine.setMachineProducedTime(new Date());//生产时间
             ptsMachine.setMachineIsPrint(1);//是否打印1:未打印2:已打印
@@ -669,5 +668,55 @@ public class AdminMachineController {
         return rj;
     }
 
+
+    /**
+     * 出库页面获取销售公司集合
+     **/
+    @ResponseBody
+    @RequiresPermissions("machine:delivery:machine")
+    @RequestMapping("/list_delivery")
+    public ResponseJson toDelivery(HttpServletRequest request) {
+        PtsSalesCompany ptsSalesCompany = new PtsSalesCompany();
+        List<PtsSalesCompany> ptsSalesCompanyList = ptsSalesCompanyService.listPtsSalesCompany(ptsSalesCompany);
+
+        if(ptsSalesCompanyList == null || ptsSalesCompanyList.size() < 1){
+            ResponseJson rj = new ResponseJson(500, "未查询出销售公司，请到后台添加销售公司信息", 500);
+            rj.addResponseKeyValue("ptsSalesCompanyList", ptsSalesCompanyList);
+            return rj;
+        }
+        ResponseJson rj = new ResponseJson(200, "SUCCESS", 200);
+        rj.addResponseKeyValue("ptsSalesCompanyList", ptsSalesCompanyList);
+        return rj;
+    }
+
+
+    /**
+     * 出库录入
+     */
+    @ResponseBody
+    @RequiresPermissions("machine:delivery:machine")
+    @RequestMapping("/machine_delivery")
+    public ResponseJson machineDelivery(HttpServletRequest request, PtsMachine ptsMachine) {
+        if (ptsMachine == null || ptsMachine.getMachineBarcode() == null || ptsMachine.getMachineSalesDate() == null || ptsMachine.getMachineSalesCompanyId() == null) {
+            ResponseJson rj = new ResponseJson(500, "ERROR", 500);
+            rj.setResultMsg("信息不全");
+            return rj;
+        }
+        PtsMachine machine = new PtsMachine();
+        machine.setMachineBarcode(ptsMachine.getMachineBarcode());
+        machine.setMachineSalesDate(ptsMachine.getMachineSalesDate());
+        machine.setMachineSalesCompanyId(ptsMachine.getMachineSalesCompanyId());
+        ptsMachine.setMachineSalesState(1); //设置状态为已售出
+        int flag = machineService.updateMachine(machine);
+        if(flag < 1){
+            ResponseJson rj = new ResponseJson(500, "ERROR", 500);
+            rj.setResultMsg("录入订单失败");
+            return rj;
+        }
+        ResponseJson rj = new ResponseJson(200, "SUCCESS", 200);
+        rj.setResultMsg("录入订单成功");
+        return rj;
+    }
+
 }
 

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/PtsSalesCompanyController.java

@@ -0,0 +1,19 @@
+package com.iamberry.rst.controllers.pts;
+
+import com.iamberry.rst.faces.pts.PtsSalesCompanyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * 销售公司controller
+ * wxm
+ */
+@Controller
+@RequestMapping("/admin/salesCompany")
+public class PtsSalesCompanyController {
+
+    @Autowired
+    private PtsSalesCompanyService ptsSalesCompanyService;
+
+}

watero-rst-web/src/main/resources/watero-rst-orm.xml

@@ -52,6 +52,7 @@
 		<typeAlias type="com.iamberry.rst.core.pts.PtsComponents" alias="PtsComponents"/>
 		<typeAlias type="com.iamberry.rst.core.pts.PtsSupplier" alias="PtsSupplier"/>
 		<typeAlias type="com.iamberry.rst.core.pts.PtsMachineVersion" alias="PtsMachineVersion"/>
+		<typeAlias type="com.iamberry.rst.core.pts.PtsSalesCompany" alias="PtsSalesCompany"/>
 	</typeAliases>
 	<!-- PageHelper -->
 	<plugins>
@@ -78,5 +79,6 @@
 		<mapper resource="com/iamberry/rst/service/pts/mapper/machineSupplierMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/pts/mapper/machineVersionMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/pts/mapper/ptsBatchMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/pts/mapper/ptsSalesCompanyMapper.xml"/>
 	</mappers>
 </configuration>

wateroPF-common-web/src/main/java/com/iamberry/common/web/SimpleCORSFilter.java

@@ -32,6 +32,7 @@ public class SimpleCORSFilter implements Filter {
 		origins.add("m.watero.cn");
 		origins.add("static.watero.cn");
 		origins.add("static.iamberry.com");
+		origins.add("rst.iamberry.com");
 	}
     public void init(FilterConfig filterConfig) throws ServletException {}
     public void doFilter(ServletRequest servletRequest, ServletResponse