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

src/main/java/com/uas/platform/b2b/model/Attach.java

@@ -1,21 +1,23 @@
 package com.uas.platform.b2b.model;
 
-import java.io.Serializable;
-import java.util.Date;
+import com.alibaba.fastjson.annotation.JSONField;
+import org.codehaus.jackson.annotate.JsonIgnore;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.*;
+import java.util.Date;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
-
-import com.alibaba.fastjson.annotation.JSONField;
-
+/**
+ * 附件信息
+ *
+ * @author US50
+ */
 @Entity
 @Table(name = "attachs")
 public class Attach implements Serializable{
@@ -90,8 +92,6 @@ public class Attach implements Serializable{
 		this.date = date;
 	}
 
-//	@JsonIgnore
-//	@JSONField(serialize = false)
 	public String getPath() {
 		return path;
 	}

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

@@ -9,13 +9,17 @@ import com.uas.platform.b2b.support.HttpUtils;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.temporary.model.FileUrl;
 import com.uas.platform.core.util.FileUtils;
+import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
+import java.io.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 文件服务
@@ -33,6 +37,11 @@ public class AttachServiceImpl implements AttachService {
      */
 	private final Integer MAX_FILE_SIZE = 100 * 1024 * 1024;
 
+    /**
+     * 记录日志
+     */
+    private static final Logger LOGGER = org.apache.log4j.Logger.getLogger(AttachServiceImpl.class);
+
 	@Override
 	public Attach getAttach(Long id) {
 		return attachDao.findOne(id);
@@ -62,8 +71,10 @@ public class AttachServiceImpl implements AttachService {
 		String path = null;
         try {
             path = HttpUtils.upload(FileUrl.FILE_UPLOAD, uploadItem.getFile(), null);
+            LOGGER.info("上传附件：" + FileUrl.FILE_UPLOAD + "成功");
         } catch (Exception e) {
             e.printStackTrace();
+            LOGGER.error("上传附件：" + FileUrl.FILE_UPLOAD + "失败， " + e.getMessage());
         }
 		Attach attach = new Attach(filename, path, description, size, new Date());
 		return attach;

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

@@ -75,7 +75,8 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
 	    StringBuffer sql = new StringBuffer("select  mr_code as inoutno, mr_date as pidate, mr_rate as rate, mr_receivecode as receivecode, " +
                 "mr_receivename as receivename, '客户委外验退单' as piclass, 'make$returnitem' as sourcetable, ma_code as ordercode, 0 as orderdetno, " +
                 "mri_number as detno,  (-(1) *  mri_qty ) as qty, mri_orderpice as orderprice, mr_currency as currency, mri_taxrate as taxrate, " +
-                "mri_whname as whname, mri_ycheckqty as ycheckqty, pr_code as prodcode, pr_spec as prodspec, pr_title as prodtitle, pr_unit as produnit, " +
+                "mri_whname as whname, mri_ycheckqty as ycheckqty, make$orders.pr_code as prodcode, make$orders.pr_spec as prodspec, " +
+                "make$orders.pr_title as prodtitle, make$orders.pr_unit as produnit, " +
                 "((-(1) *  mri_qty ) - coalesce(mri_ycheckqty, 0)) as thischeckqty, mr_enuu as custuu, ma_useruu custuseruu, mr_venduu as enuu, mri_id as sourceid, " +
                 "mr_sendcode as sendcode, ma_factory as pd_factory, en_name custname from make$return  " +
                 "join make$returnitem on mr_id =  mri_paid " +

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

@@ -245,7 +245,6 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 	}
 
 	@Override
-	@Transactional
 	public PurchaseOrderReply reply(PurchaseOrderReply reply) {
 		PurchaseOrderReply purchaseOrderReply = reply(reply, true);
 		// 单条回复产生消息
@@ -260,7 +259,8 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 	 * @param isB2b
 	 *            是否b2b新增
 	 */
-	private PurchaseOrderReply reply(PurchaseOrderReply reply, boolean isB2b) {
+	@Transactional
+	public PurchaseOrderReply reply(PurchaseOrderReply reply, boolean isB2b) {
 		if (isB2b) {
 			reply.setDate(new Date());
 			// 作为B2B->买家ERP数据是否已传输的标志--为传输

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

@@ -10107,14 +10107,19 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
             //保存生成的应收对账单
             $scope.saveApCheck = function () {
-                FaApCheck.saveApCheck({}, $scope.apCheck, function (data) {
+                if ($scope.apCheck.items.length == 0) {
                     $scope.loading = false;
-                    toaster.pop('success', '成功', '生成应收对账成功');
-                    $state.go('fa.apCheck_detail', {id: data.id}, {reload: true});
-                }, function (response) {
-                    $scope.loading = false;
-                    toaster.pop('error', '生成对账单失败', response.data);
-                })
+                    toaster.pop('error', '请先选择需要对账的数据');
+                } else {
+                    FaApCheck.saveApCheck({}, $scope.apCheck, function (data) {
+                        $scope.loading = false;
+                        toaster.pop('success', '成功', '生成应收对账成功');
+                        $state.go('fa.apCheck_detail', {id: data.id}, {reload: true});
+                    }, function (response) {
+                        $scope.loading = false;
+                        toaster.pop('error', '生成对账单失败', response.data);
+                    })
+                }
             };
 
             //如果是同一家客户，生成对账单的同时，关闭模态框