调整销售开票和采购开票填写公司

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW010.java

@@ -229,9 +229,9 @@ public class ServiceHGCW010 extends ServiceBase {
                 if (StringUtils.isEmpty(mainId)) {
                     //先生成主表
                     HGCW010 hgcw010 = new HGCW010();
-                    UserVO userVO = HGCWTools.HgCw002.getUserCompany();
-                    hgcw010.setCompanyCode(userVO.getUsercode());
-                    hgcw010.setCompanyName(userVO.getUsername());
+                    //UserVO userVO = HGCWTools.HgCw002.getUserCompany();
+                    hgcw010.setCompanyCode(hgcw011List.get(0).getCompanyCode());
+                    hgcw010.setCompanyName(hgcw011List.get(0).getCompanyName());
                     hgcw010.setBillTybe(1);
                     hgcw010.setReviewStatus(0);
                     hgcw010.setBillState(1);

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW014.java

@@ -90,9 +90,9 @@ public class ServiceHGCW014 extends ServiceBase {
             for (int i = 0; i < resultRows.size(); i++) {
                 HGCW014 HGCW014 = new HGCW014();
                 HGCW014.fromMap(resultRows.get(i));
-                UserVO userVO = HGCWTools.HgCw002.getUserCompany();
+                /*UserVO userVO = HGCWTools.HgCw002.getUserCompany();
                 HGCW014.setCompanyCode(userVO.getUsercode());
-                HGCW014.setCompanyName(userVO.getUsername());
+                HGCW014.setCompanyName(userVO.getUsername());*/
                 HGCW014.setCancelStatus(1);
                 HGCW014.setReviewStatus(0);
                 HGCW014.setIncomeNumber(SequenceGenerator.getNextSequence(HGConstant.SequenceId.CW_COLLECTION_NO));
@@ -183,9 +183,9 @@ public class ServiceHGCW014 extends ServiceBase {
                 if (StringUtils.isEmpty(mainId)) {
                     //先生成主表
                     HGCW014 hgcw014 = new HGCW014();
-                    UserVO userVO = HGCWTools.HgCw002.getUserCompany();
-                    hgcw014.setCompanyCode(userVO.getUsercode());
-                    hgcw014.setCompanyName(userVO.getUsername());
+                    //UserVO userVO = HGCWTools.HgCw002.getUserCompany();
+                    hgcw014.setCompanyCode(hgcw015List.get(0).getCompanyCode());
+                    hgcw014.setCompanyName(hgcw015List.get(0).getCompanyName());
                     hgcw014.setCancelStatus(1);
                     hgcw014.setReviewStatus(ReviewStatusEnum.UNREVIEWED.getCode());
                     hgcw014.setIncomeNumber(SequenceGenerator.getNextSequence(HGConstant.SequenceId.CW_COLLECTION_NO));