合并通知单新增时根据合同编号取数

src/main/java/com/chinaitop/depot/business/controller/BusinessMergeNoticeController.java

@@ -0,0 +1,39 @@
+package com.chinaitop.depot.business.controller;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.chinaitop.depot.business.model.BusinessMergeNotice;
+import com.chinaitop.depot.business.model.BusinessMergeNoticeDetail;
+import com.chinaitop.depot.business.service.BusinessMergeNoticeService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+@RestController
+@RequestMapping(value="/depot/business/businessMergeNotice")
+@Api(value= "BusinessMergeNoticeController", description = "合并通知单管理")
+public class BusinessMergeNoticeController {
+
+	@Resource
+	private BusinessMergeNoticeService businessMergeNoticeService;
+
+	@RequestMapping(value="/findByHtbhCondition",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.GET)
+	@ApiOperation(value="根据合同编号获取通知单数据列表", notes = "")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "htbh", value = "合同编号", required=true, paramType = "query"),
+		@ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query")
+	})
+    public List<BusinessMergeNoticeDetail> findByHtbhCondition(String htbh, Integer orgId) {
+		List<BusinessMergeNoticeDetail> list = businessMergeNoticeService.findByHtbhCondition(htbh, orgId);
+        return list;
+    }
+}

src/main/java/com/chinaitop/depot/business/mapper/BusinessMergeNoticeMapper.java

@@ -0,0 +1,18 @@
+package com.chinaitop.depot.business.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.chinaitop.depot.business.model.BusinessMergeNotice;
+import com.chinaitop.depot.business.model.BusinessMergeNoticeDetail;
+
+public interface BusinessMergeNoticeMapper {
+
+	/**
+	 * 根据合同编号获取通知单数据列表
+	 * @param businessMergeNotice
+	 * @return
+	 */
+	List<BusinessMergeNoticeDetail> findByHtbhCondition(@Param("obj") BusinessMergeNoticeDetail obj);
+}

src/main/java/com/chinaitop/depot/business/mapper/BusinessMergeNoticeMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.chinaitop.depot.business.mapper.BusinessMergeNoticeMapper" >
+  <!-- 根据合同编号获取通知单数据列表 -->
+  <select id="findByHtbhCondition" resultType="com.chinaitop.depot.business.model.BusinessMergeNoticeDetail" parameterType="map">
+	SELECT 
+      a.org_id orgId,a.id tzdid, a.bill_number tzdbh, a.shiping_count jhsl, a.contract htbh, c.khmc khmc, b.grain_kind lspz, b.house_id ch, b.warehouse_id hwh
+    FROM business_delivery_storage_notice a
+    LEFT JOIN business_store_ware_detail b on b.zid=a.id AND b.type='notice'
+	LEFT JOIN business_contract_receive c on c.htbh=a.contract
+	WHERE 1=1
+	AND a.contract = #{obj.htbh,jdbcType=VARCHAR}
+	AND a.org_id = #{obj.orgId,jdbcType=INTEGER}
+	ORDER BY a.create_time DESC
+  </select>
+</mapper>

src/main/java/com/chinaitop/depot/business/model/BusinessMergeNotice.java

@@ -0,0 +1,5 @@
+package com.chinaitop.depot.business.model;
+
+public class BusinessMergeNotice {
+
+}

src/main/java/com/chinaitop/depot/business/model/BusinessMergeNoticeDetail.java

@@ -0,0 +1,51 @@
+package com.chinaitop.depot.business.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 合并通知单明细
+ * @author fxw
+ *
+ */
+@Data
+public class BusinessMergeNoticeDetail {
+
+	@ApiModelProperty(value = "主键唯一uuid")
+	private String id;
+	@ApiModelProperty(value = "库ID")
+	private Integer orgId;
+	@ApiModelProperty(value = "数据创建时间")
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date cjsj;
+	@ApiModelProperty(value = "创建人")
+	private String cjr;
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "最后修改时间")
+	private Date updatetime;
+	@ApiModelProperty(value = "数据类型(0:原通知单,1:目标通知单)")
+	private String datatype;
+	@ApiModelProperty(value = "通知单ID")
+	private String tzdid;
+	@ApiModelProperty(value = "通知单编号")
+	private String tzdbh;
+	@ApiModelProperty(value = "合同编号")
+	private String htbh;
+	@ApiModelProperty(value = "粮食品种")
+	private Integer lspz;
+	@ApiModelProperty(value = "客户名称")
+	private String khmc;
+	@ApiModelProperty(value = "仓房ID")
+	private Integer ch;
+	@ApiModelProperty(value = "货位ID")
+	private Integer hwh;
+	@ApiModelProperty(value = "原计划数量(kg)")
+	private BigDecimal jhsl;
+	@ApiModelProperty(value = "原剩余数量(kg)")
+	private BigDecimal sysl;
+}

src/main/java/com/chinaitop/depot/business/service/BusinessMergeNoticeService.java

@@ -0,0 +1,20 @@
+package com.chinaitop.depot.business.service;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.chinaitop.depot.business.model.BusinessMergeNotice;
+import com.chinaitop.depot.business.model.BusinessMergeNoticeDetail;
+
+public interface BusinessMergeNoticeService {
+
+	/**
+	 * 通过合同编号查询通知单数据
+	 * @param htbh 合同编号
+	 * @param orgId 库id
+	 * @return
+	 */
+	List<BusinessMergeNoticeDetail> findByHtbhCondition(String htbh, Integer orgId);
+
+}

src/main/java/com/chinaitop/depot/business/service/impl/BusinessMergeNoticeServiceImpl.java

@@ -0,0 +1,65 @@
+package com.chinaitop.depot.business.service.impl;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import com.chinaitop.depot.agile.model.BusinessScedule;
+import com.chinaitop.depot.business.mapper.BusinessMergeNoticeMapper;
+import com.chinaitop.depot.business.model.BusinessMergeNotice;
+import com.chinaitop.depot.business.model.BusinessMergeNoticeDetail;
+import com.chinaitop.depot.business.service.BusinessMergeNoticeService;
+import com.chinaitop.depot.business.service.FeignAgileService;
+
+@Service
+public class BusinessMergeNoticeServiceImpl implements BusinessMergeNoticeService {
+
+	@Resource
+	private BusinessMergeNoticeMapper businessMergeNoticeMapper;
+	@Resource
+	private FeignAgileService feignAgileService;
+
+	@Override
+	public List<BusinessMergeNoticeDetail> findByHtbhCondition(String htbh, Integer orgId) {
+		BusinessMergeNoticeDetail obj = new BusinessMergeNoticeDetail();
+		obj.setOrgId(orgId);
+		obj.setHtbh(htbh);
+		List<BusinessMergeNoticeDetail> tzd_list = businessMergeNoticeMapper.findByHtbhCondition(obj);
+		if (!ObjectUtils.isEmpty(tzd_list)) {
+			// 通过通知单id,去出入库查询.
+			List<String> tzdid_list = tzd_list.stream().map(BusinessMergeNoticeDetail::getTzdid).collect(Collectors.toList());
+			String tzdid_str = "('"+String.join("','", tzdid_list)+"')";
+			List<BusinessScedule> businessSceduleList = feignAgileService.getNoticeSceduleInNoticeId(tzdid_str);
+            if (businessSceduleList != null && businessSceduleList.size() > 0) {
+            	for (BusinessMergeNoticeDetail d : tzd_list) {
+            		// 循环出入库，查询的list.
+            		d.setSysl(new BigDecimal("0"));//先设置为0， 避免没有查到数据显示为空的情况
+                    for (BusinessScedule businessScedule : businessSceduleList) {
+                    	if (d.getTzdid().equals(businessScedule.getTzdId())) {
+
+                    		BigDecimal s = new BigDecimal(1000);
+                    		BigDecimal sumSysl = new BigDecimal(businessScedule.getSumSysl()).divide(s).setScale(3, BigDecimal.ROUND_DOWN);
+                    		d.setSysl(sumSysl);
+
+                			// 在出入库list中删除该数据，这样下次循环数量就会减少了.
+                			businessSceduleList.remove(businessScedule);
+                			// 跳出当前的出入库循环.
+                			break;
+                    	}
+                    }
+            	}
+            } else {
+            	for (BusinessMergeNoticeDetail d : tzd_list) {
+            		d.setSysl(new BigDecimal("0"));
+            	}
+            }
+		}
+		return tzd_list;
+	}
+
+}