merge

applications/money/money-dto/src/main/java/com/usoftchina/saas/money/dto/VerificationListDTO.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * @createtime 2018-10-22-17:02
  */
 @Data
-public class VerificationListDTO extends CommonBaseEntity implements Serializable {
+public class VerificationListDTO implements Serializable {
     private Integer vc_id;
 
     private String vc_code;

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

@@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.*;
  * @author yingp
  * @date 2018/10/9
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/purchase")
 public class PurchaseController {

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

@@ -331,7 +331,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
                  targetPid.setPd_outqty(sourcePid.getPd_inqty()-sourcePid.getPd_yqty());
                  prodIODetailMapper.insertSelective(targetPid);
                  //更新已转数
-                 sourcePid.setPd_yqty(sourcePid.getPd_inqty());
+               //  sourcePid.setPd_yqty(sourcePid.getPd_inqty());
                  prodIODetailMapper.updateByPrimaryKeySelective(sourcePid);
              }
          }
@@ -344,7 +344,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         }
         Integer count = "0".equals(String.valueOf(id)) ? purchaseMapper.validateCodeWhenInsert(code) :
                 purchaseMapper.validateCodeWhenUpdate(code, id);
-        return maxnumberService.pushMaxnubmer(count, code, "Purchase");
+        return maxnumberService.pushMaxnubmer(count, code, "Purchase").getData();
     }
 
 

applications/purchase/purchase-server/src/main/resources/application.yml

@@ -47,7 +47,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8500/eureka/
 server:
   port: 8800
   tomcat:

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

@@ -57,6 +57,7 @@
 
     <select id="selectPurchaseListByCondition"  resultMap="BaseResultMap">
         select  *  from purchase left join purchasedetail on pu_id=pd_puid
+        left join product on pd_prodcode=pr_code
         <where>
             <if test="con != null">
                  ${con}

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

@@ -101,7 +101,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         addTitle: '采购单',
         addXtype: 'purchase-purchase-formpanel',
         defaultCondition:'',
-        baseVastUrl: basePath+'/purchase/purchase/',
+        baseVastUrl: basePath+'purchase/purchase/',
         baseColumn: [{
             text: '序号',
             width: 80,

pom.xml

@@ -296,11 +296,6 @@
                 <artifactId>sale-dto</artifactId>
                 <version>${project.release.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.usoftchina.saas</groupId>
-                <artifactId>sale-dto</artifactId>
-                <version>${project.release.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.usoftchina.saas</groupId>
                 <artifactId>test-starter</artifactId>