销售单增加默认值

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

@@ -24,6 +24,8 @@ public class SaleDTO extends CommonBaseDTO{
 
     private String sa_totalupper;
 
+    private String sa_toplace;
+
     private String sa_status;
 
     private String sa_statuscode;
@@ -42,6 +44,8 @@ public class SaleDTO extends CommonBaseDTO{
 
     private Date sa_recorddate;
 
+    private String sa_remark;
+
     private String sa_text1;
 
     private String sa_text2;

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/Sale.java

@@ -39,7 +39,7 @@ public class Sale extends CommonBaseEntity{
 
     private String sa_printstatuscode;
 
-    private Integer sa_recorderid;
+    private Long sa_recorderid;
 
     private String sa_recorder;
 

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

@@ -114,6 +114,8 @@ public class SaleServiceImpl implements SaleService{
         sale.setCompanyId(companyId);
         sale.setCreatorId(userId);
         sale.setCreateTime(new Date());
+        sale.setSa_recorderid(userId);
+        sale.setSa_recorder("test");
 
         //编号校验
         sa_code = pushMaxnubmer(sa_code, sa_id);
@@ -129,6 +131,7 @@ public class SaleServiceImpl implements SaleService{
                 SaleDetail detail = BeanMapper.map(item, SaleDetail.class);
                 detail.setSd_said(sa_id);
                 detail.setSd_code(sa_code);
+                detail.setSd_yqty(0.0);
                 insertDetails.add(detail);
             }
             //插入从表
@@ -406,6 +409,7 @@ public class SaleServiceImpl implements SaleService{
         Integer count = 0;
         double pdQty = 0;
         double pdYqty = 0;
+        Long companyId = BaseContextHolder.getCompanyId();
         Sale sale = saleMapper.selectByPrimaryKey(id);
         List<SaleDetail> details = saledetailMapper.selectByFK(id);
         if (null == sale || StringUtils.isEmpty(sale.getSa_code()) || details.size() == 0) {
@@ -450,7 +454,7 @@ public class SaleServiceImpl implements SaleService{
         prodInOut.setPi_said(sale.getId());
         prodInOut.setPi_sacode(sale.getSa_code());
         //设置公司id
-        prodInOut.setCompanyId(sale.getCompanyId());
+        prodInOut.setCompanyId(companyId);
 
         prodInOutMapper.insertSelective(prodInOut);
         //插入出货单从表
@@ -470,7 +474,7 @@ public class SaleServiceImpl implements SaleService{
             prodIODetail.setPd_prodid(saleDetail.getSd_prodid());
             prodIODetail.setPd_prodcode(saleDetail.getSd_prodcode());
             //公司id
-            prodIODetail.setCompanyId(saleDetail.getCompanyId());
+            prodIODetail.setCompanyId(companyId);
             //本次转单数
             prodIODetail.setPd_inqty((saleDetail.getSd_qty()-saleDetail.getSd_yqty()));
             prodIODetailMapper.insertSelective(prodIODetail);