Просмотр исходного кода

处理询价转报价时没有记录询价单来源,没有记录供应商物料编号的bug

hejq 8 лет назад
Родитель
Сommit
1e099ccd0c

+ 5 - 5
src/main/java/com/uas/platform/b2b/model/PublicInquiryItem.java

@@ -278,7 +278,7 @@ public class PublicInquiryItem implements Serializable {
 	 * 应用来源ERP、B2B
 	 */
 	@Column(name = "id_sourceapp")
-	private String sourceApp;
+	private String source;
 
     /**
      * 报价的应用
@@ -597,12 +597,12 @@ public class PublicInquiryItem implements Serializable {
 		this.date = date;
 	}
 
-	public String getSourceApp() {
-		return sourceApp;
+	public String getSource() {
+		return source;
 	}
 
-	public void setSourceApp(String sourceApp) {
-		this.sourceApp = sourceApp;
+	public void setSource(String source) {
+		this.source = source;
 	}
 
     public String getQutoApp() {

+ 2 - 2
src/main/java/com/uas/platform/b2b/service/impl/PubInquiryServiceImpl.java

@@ -214,7 +214,7 @@ public class PubInquiryServiceImpl implements PubInquiryService {
                 item.setStatus((short) Status.NOT_REPLY.value());
                 item.setVendUU(enuu);
                 item.setVendUserUU(useruu);
-                item.setSourceApp(purcInquiryItem.getSource());
+                item.setSource(purcInquiryItem.getSource());
                 item.setCustLap(Constant.NO);
                 item.setSendStatus((short) Status.NOT_UPLOAD.value());
                 item.setSourceId(id);
@@ -268,7 +268,7 @@ public class PubInquiryServiceImpl implements PubInquiryService {
                         item.setProductId(purcInquiryItem.getProductId());
                         item.setVendUU(SystemSession.getUser().getEnterprise().getUu());
                         item.setVendUserUU(SystemSession.getUser().getUserUU());
-                        item.setSourceApp(purcInquiryItem.getSource());
+                        item.setSource(purcInquiryItem.getSource());
                         item.setStatus((short) Status.NOT_REPLY.value());
                         item.setCustLap(Constant.NO);
                         item.setSendStatus((short) Status.NOT_UPLOAD.value());

+ 0 - 7
src/main/webapp/resources/js/index/app.js

@@ -5527,7 +5527,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         // 转客户询价
         $scope.transtoInquiry = function (inquiryItem) {
             publicInquiry.quotationInfo({id: inquiryItem.id}, function(data) {
-                console.log(data);
                 if (data.inquiryItem) { //存在已报价的就不进行报价操作
                     toaster.pop('error', '该询价单已已经报价');
                 } else {
@@ -5556,12 +5555,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             window.open("#/sale/pubinquiry");
         }
 
-        var pageInfo = {
-            pageNumber: 1,
-            pageSize: 20
-        }
-
-
     }]);
 
     /**

+ 1 - 1
src/main/webapp/resources/tpl/index/baseInfo/modal/quotation_modal.html

@@ -181,7 +181,7 @@
             <div class="form-group">
                 <label for="inputEmail5" class="col-xs-4 control-label">供应商型号</label>
                 <div class="col-xs-8">
-                    <input type="text" class="form-control" id="inputEmail5" placeholder="1000">
+                    <input type="text" class="form-control" id="inputEmail5" placeholder="1000" ng-model="inquiryItem.vendorprodcode">
                 </div>
             </div>
         </div>