Browse Source

bug修改

guq 7 years ago
parent
commit
a07703b0e0

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

@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.*;
  * Created by zdw
  * 2018-10-17 11:41.
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/prodinout")
 public class ProdInOutController {

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

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

+ 0 - 1
applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/controller/ProdInOutController.java

@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
  * Created by wyx
  * 2018-10-23.
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/prodinout")
 public class ProdInOutController {

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

@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.*;
  * @author: guq
  * @create: 2018-10-22 11:28
  **/
-@CrossOrigin
 @RestController
 @RequestMapping("/sale")
 public class SaleController {

+ 1 - 0
applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/SaleServiceImpl.java

@@ -160,6 +160,7 @@ public class SaleServiceImpl implements SaleService{
             SaleDetail detail = BeanMapper.map(item, SaleDetail.class);
             detail.setSd_said(sa_id);
             detail.setSd_code(sa_code);
+            detail.setCompanyId(companyId);
             if (StringUtils.isEmpty(detail.getId()) || "0".equals(detail.getId().toString())) {
                 insertDetails.add(detail);
             } else {

+ 2 - 1
frontend/saas-web/app/model/sale/Saledetail.js

@@ -12,7 +12,8 @@ Ext.define('saas.model.sale.Saledetail', {
         { name: 'sd_total', type: 'float' },
         { name: 'sd_delivery', type: 'date' },
         { name: 'sd_taxtotal', type: 'float' },
-        { name: 'sd_pucode', type: 'string' }
+        { name: 'sd_pucode', type: 'string' },
+        { name: 'sd_text1', type: 'string' }
     ],
     //一对一映射
     associations: [{ type: 'hasOne', model: 'saas.model.document.Product', associationKey: 'productDTO'}]