出库结算管理

src/main/java/com/chinaitop/depot/device/controller/StorageJsglController.java

@@ -30,8 +30,6 @@ public class StorageJsglController {
 
 	@Resource
 	private StorageJsglService storageJsglService;
-	@Resource
-	private StorageJsglKhxxService storageJsglKhxxService;
 
 	@RequestMapping(value = "/getPageInfoList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
     @ApiOperation(value = "结算管理列表查询", notes = "支持分页")
@@ -94,7 +92,6 @@ public class StorageJsglController {
 		try {
 			if (null != id) {
 				storageJsgl = storageJsglService.findByParmaryKey(id);
-				storageJsgl.setJsglKhxxList(storageJsglKhxxService.queryList(id));
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -114,7 +111,6 @@ public class StorageJsglController {
 
 		try {
 			storageJsglService.removeStorageJsgl(id);
-			storageJsglKhxxService.deleteByZid(id);
 			map.put("status", "200");
 		} catch (Exception e) {
 			map.put("status", "500");
@@ -123,17 +119,4 @@ public class StorageJsglController {
 
         return map;
     }
-
-	@RequestMapping(value = "/deleteKhxx", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
-    @ApiOperation(value = "删除一条客户信息", notes = "")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "id", value = "数据ID", paramType = "form")
-    })
-	public void deleteKhxx(String id) {
-		try {
-			storageJsglKhxxService.delete(id);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
 }

src/main/java/com/chinaitop/depot/device/model/StorageJsgl.java

@@ -2,7 +2,6 @@ package com.chinaitop.depot.device.model;
 
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 
@@ -76,9 +75,6 @@ public class StorageJsgl {
 
     private String fpText;
 
-    /* 散粮结算使用:客户信息 */
-    private List<StorageJsglKhxx> jsglKhxxList;
-
     /**
      * 主键唯一ID
      * @return id 主键唯一ID
@@ -598,21 +594,4 @@ public class StorageJsgl {
     public String getYwlx() {
         return ywlx;
     }
-
-    /**
-     * 业务类型(0:散粮,1:非散粮)
-     * @param ywlx 业务类型(0:散粮,1:非散粮)
-     */
-    public void setYwlx(String ywlx) {
-        this.ywlx = ywlx == null ? null : ywlx.trim();
-    }
-
-	public List<StorageJsglKhxx> getJsglKhxxList() {
-		return jsglKhxxList;
-	}
-
-	public void setJsglKhxxList(List<StorageJsglKhxx> jsglKhxxList) {
-		this.jsglKhxxList = jsglKhxxList;
-	}
-    
 }

src/main/java/com/chinaitop/depot/device/service/impl/StorageJsglServiceImpl.java

@@ -2,7 +2,6 @@ package com.chinaitop.depot.device.service.impl;
 
 import java.util.Date;
 import java.util.List;
-import java.util.UUID;
 
 import javax.annotation.Resource;
 
@@ -10,12 +9,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.chinaitop.depot.device.mapper.StorageJsglKhxxMapper;
 import com.chinaitop.depot.device.mapper.StorageJsglMapper;
 import com.chinaitop.depot.device.model.StorageJsgl;
 import com.chinaitop.depot.device.model.StorageJsglExample;
 import com.chinaitop.depot.device.model.StorageJsglExample.Criteria;
-import com.chinaitop.depot.device.model.StorageJsglKhxx;
 import com.chinaitop.depot.device.service.StorageJsglService;
 import com.chinaitop.depot.feignClients.service.DepotBusinessFeignService;
 import com.chinaitop.depot.utils.ParameterUtil;
@@ -26,8 +23,6 @@ public class StorageJsglServiceImpl implements StorageJsglService {
 	@Resource
 	private StorageJsglMapper storageJsglMapper;
 	@Resource
-	private StorageJsglKhxxMapper storageJsglKhxxMapper;
-	@Resource
 	private DepotBusinessFeignService depotBusinessFeignService;
 
 	@Override
@@ -93,20 +88,6 @@ public class StorageJsglServiceImpl implements StorageJsglService {
 		//生成发票号集合
 		String fpText = getFpText(storageJsgl);
 		storageJsgl.setFpText(fpText);
-		
-		//散粮结算:保存多个客户信息
-		List<StorageJsglKhxx> jsglKhxxList = storageJsgl.getJsglKhxxList();
-		for (StorageJsglKhxx jkl : jsglKhxxList) {
-			if (StringUtils.isNotBlank(jkl.getId())) {
-				jkl.setUpdatetime(new Date());
-				storageJsglKhxxMapper.updateByPrimaryKey(jkl);
-			} else {
-				jkl.setCjsj(new Date());
-				jkl.setUpdatetime(new Date());
-				jkl.setId(UUID.randomUUID().toString().replace("-", ""));
-				storageJsglKhxxMapper.insert(jkl);
-			}
-		}
 
 		if (StringUtils.isBlank(storageJsgl.getId())) {
 			addStorageJsgl(storageJsgl);