入库结算管理

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

@@ -49,7 +49,7 @@ public class BusinessContractReceiveController {
 		@ApiImplicitParam(name = "htlx", value = "合同类型(0:采购,1:销售)", paramType = "query")
 	})
     public PageInfo<BusinessContractReceive> getList(Integer pageNum, Integer pageSize, 
-    		String htbh ,Integer orgId, Integer houseId, Integer warehouseId, String htlx) {
+    		String htbh ,Integer orgId, Integer houseId, Integer warehouseId, String htlx, String surplus) {
        
 		PageInfo<BusinessContractReceive> pageInfo = null;
 
@@ -58,7 +58,7 @@ public class BusinessContractReceiveController {
         	if (null != pageNum && null != pageSize) {
         		PageHelper.startPage(pageNum, pageSize);
         	}
-			list = businessContractReceiveService.queryByExample(htbh, orgId, houseId, warehouseId, htlx);
+			list = businessContractReceiveService.queryByExample(htbh, orgId, houseId, warehouseId, htlx, surplus);
 			pageInfo = new PageInfo<BusinessContractReceive>(list);
 		} catch (Exception e) {
 			logger.error(e.getMessage(), e);

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

@@ -1677,6 +1677,12 @@ public class BusinessContractReceiveExample {
             addCriterion("data_type not between", value1, value2, "dataType");
             return (Criteria) this;
         }
+
+        // 非字段条件-业务特殊需求(剩余数量为“0”的合同不展示在列表中)
+        public Criteria andSurplusNotEqualTo() {
+            addCriterion("(htzsl - yjssl) <> 0");
+            return (Criteria) this;
+        }
     }
 
     /**

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

@@ -24,7 +24,7 @@ public interface BusinessContractReceiveService {
 	 * @param htlx 合同类型(0:采购,1:销售)
 	 * @return
 	 */
-	List<BusinessContractReceive> queryByExample(String htbh, Integer orgId, Integer houseId, Integer warehouseId, String htlx) throws Exception;
+	List<BusinessContractReceive> queryByExample(String htbh, Integer orgId, Integer houseId, Integer warehouseId, String htlx, String surplus) throws Exception;
 
 	/**
 	 * 主键查询一条数据

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

@@ -265,7 +265,7 @@ public class BusinessContractReceiveServiceImpl implements BusinessContractRecei
 	}
 
 	@Override
-	public List<BusinessContractReceive> queryByExample(String htbh, Integer orgId, Integer houseId, Integer warehouseId, String htlx)
+	public List<BusinessContractReceive> queryByExample(String htbh, Integer orgId, Integer houseId, Integer warehouseId, String htlx, String surplus)
 			throws Exception {
 		List<BusinessContractReceive> list = null;
 		BusinessContractReceiveExample example = new BusinessContractReceiveExample();
@@ -285,6 +285,10 @@ public class BusinessContractReceiveServiceImpl implements BusinessContractRecei
 		if (StringUtils.isNotBlank(htlx)) {
 			criteria.andHtlxEqualTo(htlx);
 		}
+		// 合同类型(0:采购,1:销售)
+		if (StringUtils.isNotEmpty(surplus) && "0".equals(surplus)) {
+			criteria.andSurplusNotEqualTo();
+		}
 		example.setOrderByClause("input_time desc");
 		list = businessContractReceiveMapper.selectByExample(example);
 		return list;

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

@@ -710,7 +710,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 		String path = sysCodeService.getSVal(10, "tshtyyzt");
 
 		BusinessNoticeReceive businessNoticeReceive = formatObject(notice);
-		List<BusinessContractReceive> list = businessContractReceiveService.queryByExample(businessNoticeReceive.getHtbh(), businessNoticeReceive.getOrgId(), null, null, null);
+		List<BusinessContractReceive> list = businessContractReceiveService.queryByExample(businessNoticeReceive.getHtbh(), businessNoticeReceive.getOrgId(), null, null, null, null);
 		if (null != list && list.size() > 0) {
 			String htbm = list.get(0).getSptHtid();