Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/uas/platform/b2b/service/impl/PurcProductServiceImpl.java

@@ -50,6 +50,7 @@ public class PurcProductServiceImpl implements PurcProductService {
 				if (row != null && row.getCell(0) != null && row.getCell(0).getCellType() != Cell.CELL_TYPE_BLANK) {
 					total++;
 					Product product = new Product();
+					//TODO huangct 上传文件中存在必填信息缺失的情况处理
 
 					// 物料编号
 					if (row.getCell(0) != null) {
@@ -60,6 +61,7 @@ public class PurcProductServiceImpl implements PurcProductService {
 					if (row.getCell(1) != null) {
 						row.getCell(1).setCellType(Cell.CELL_TYPE_STRING);
 						product.setTitle(row.getCell(1).getStringCellValue().trim());
+
 					}
 
 					// 原厂型号

src/main/webapp/resources/js/index/app.js

@@ -12694,6 +12694,15 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             }
         };
 
+        // 获取回复记录
+        $scope.getReply = function (item) {
+            if (!item.replies) {
+                MakeOutOrder.getReply({orderId: item.id}, function (replies) {
+                    item.replies = replies;
+                });
+            }
+        };
+
         // 打开回复
         $scope.openReply = function (change) {
             change.$editing = true;

src/main/webapp/resources/js/index/services/Make.js

@@ -108,6 +108,14 @@ define([ 'ngResource'], function() {
 		});
 	}]).factory('MakeOutOrder', ['$resource',function($resource){
 		return $resource('make/outorders/info/search', {}, {
+            getReply: {
+                url: 'make/orders/:orderId/reply',
+                method: 'GET',
+                isArray: true,
+                params: {
+                    orderId: 'orderId'
+                }
+            },
 			getAll: {},
 			getItem: {
 				url: 'make/outorders/:id/info',