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

# Conflicts: # src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java

Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
xqs
2 parents 9e7efbc3 372cfce7
Showing 17 changed files with 416 additions and 60 deletions
src/main/java/com/huaheng/pc/general/location/mapper/LocationMapper.java
src/main/java/com/huaheng/pc/general/location/service/LocationService.java
src/main/java/com/huaheng/pc/general/location/service/LocationServiceImpl.java
src/main/java/com/huaheng/pc/shipment/shipmentContainerDetail/domain/ShipmentContainerDetail.java
src/main/java/com/huaheng/pc/shipment/shipmentContainerDetail/mapper/ShipmentContainerDetailMapper.java
src/main/java/com/huaheng/pc/shipment/shipmentContainerDetail/service/ShipmentContainerDetailService.java
src/main/java/com/huaheng/pc/shipment/shipmentContainerDetail/service/ShipmentContainerDetailServiceImpl.java
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentContainerHeader.java
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderService.java
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java
src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java
src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java
src/main/resources/mybatis/general/LocationMapper.xml
src/main/resources/mybatis/shipment/ShipmentCombinationMapper.xml
src/main/resources/mybatis/shipment/ShipmentContainerDetailMapper.xml
src/main/resources/mybatis/shipment/ShipmentContainerHeaderMapper.xml
@@ -2,6 +2,10 @@ package com.huaheng.pc.general.location.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huaheng.pc.general.location.domain.Location;
+import org.apache.ibatis.annotations.Param;
 public interface LocationMapper extends BaseMapper<Location> {
+
+    void updateStatus(@Param("warehouseCode") String warehouseCode, @Param("code") String code, @Param("status") String status);
+
 }
 \ No newline at end of file
@@ -6,4 +6,6 @@ public interface LocationService extends IService&lt;Location&gt;{
     boolean insertLocation(Location location);
+    void updateStatus(String locationCode, String status);
+
 }
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.huaheng.common.exception.service.ServiceException;
+import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.pc.config.locationType.domain.LocationType;
 import com.huaheng.pc.config.locationType.service.LocationTypeService;
@@ -29,6 +30,8 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
     private LocationTypeService locationTypeService;
     @Resource
     private ZoneService zoneService;
+    @Resource
+    private LocationMapper locationMapper;
     @Override
     public boolean insertLocation(Location location) {
@@ -94,4 +97,11 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
         Boolean result = locationService.saveBatch(locations);
         return result;
     }
+
+    @Override
+    public void updateStatus(String locationCode, String status) {
+        if (StringUtils.isNotEmpty(locationCode)) {
+            locationMapper.updateStatus(ShiroUtils.getWarehouseCode(), locationCode, status);
+        }
+    }
 }
@@ -28,6 +28,20 @@ public class ShipmentContainerDetail implements Serializable {
     private String containerCode;
     /**
+     * 库位
+     */
+    @TableField(value = "locationCode")
+    @ApiModelProperty(value="库位")
+    private String locationCode;
+
+    /**
+     * 库存Id
+     */
+    @TableField(value = "inventoryId")
+    @ApiModelProperty(value="库存Id")
+    private String inventoryId;
+
+    /**
      * 出库箱头内部号
      */
     @TableField(value = "shippingContainerId")
@@ -381,6 +395,10 @@ public class ShipmentContainerDetail implements Serializable {
     public static final String COL_CONTAINERCODE = "containerCode";
+    public static final String COL_LOCATIONCODE = "locationCode";
+
+    public static final String COL_INVENTORYID= "inventoryId";
+
     public static final String COL_SHIPPINGCONTAINERID = "shippingContainerId";
     public static final String COL_SHIPMENTCODE = "shipmentCode";
@@ -517,6 +535,23 @@ public class ShipmentContainerDetail implements Serializable {
         this.containerCode = containerCode;
     }
+
+    public String getLocationCode() {
+        return locationCode;
+    }
+
+    public void setLocationCode(String locationCode) {
+        this.locationCode = locationCode;
+    }
+
+    public String getInventoryId() {
+        return inventoryId;
+    }
+
+    public void setInventoryId(String inventoryId) {
+        this.inventoryId = inventoryId;
+    }
+
     /**
      * 获取出库箱头内部号
      *
@@ -2,6 +2,13 @@ package com.huaheng.pc.shipment.shipmentContainerDetail.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huaheng.pc.shipment.shipmentContainerDetail.domain.ShipmentContainerDetail;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 public interface ShipmentContainerDetailMapper extends BaseMapper<ShipmentContainerDetail> {
+
+    List<Map<String, Object>> selectListMapByEqual(@Param("columns") String columns, @Param("condition") ShipmentContainerDetail condition);
+
 }
 \ No newline at end of file
@@ -2,7 +2,12 @@ package com.huaheng.pc.shipment.shipmentContainerDetail.service;
 import com.huaheng.pc.shipment.shipmentContainerDetail.domain.ShipmentContainerDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
 public interface ShipmentContainerDetailService extends IService<ShipmentContainerDetail>{
+    List<Map<String, Object>> selectListMapByEqual(String columnList, ShipmentContainerDetail condition);
 }
@@ -3,11 +3,19 @@ package com.huaheng.pc.shipment.shipmentContainerDetail.service;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.pc.shipment.shipmentContainerDetail.mapper.ShipmentContainerDetailMapper;
 import com.huaheng.pc.shipment.shipmentContainerDetail.domain.ShipmentContainerDetail;
-import com.huaheng.pc.shipment.shipmentContainerDetail.service.ShipmentContainerDetailService;
 @Service
 public class ShipmentContainerDetailServiceImpl extends ServiceImpl<ShipmentContainerDetailMapper, ShipmentContainerDetail> implements ShipmentContainerDetailService{
+    @Resource
+   private ShipmentContainerDetailMapper shipmentContainerDetailMapper;
+
+    @Override
+    public List<Map<String, Object>> selectListMapByEqual(String columns, ShipmentContainerDetail condition) {
+        return shipmentContainerDetailMapper.selectListMapByEqual(columns, condition);
+    }
 }
@@ -27,6 +27,14 @@ public class ShipmentContainerHeader implements Serializable {
     @ApiModelProperty(value="出库箱号")
     private String containerCode;
+
+    /**
+     * 库位
+     */
+    @TableField(value = "locationCode")
+    @ApiModelProperty(value="库位")
+    private String locationCode;
+
     /**
      * 仓库
      */
@@ -44,9 +52,9 @@ public class ShipmentContainerHeader implements Serializable {
     /**
      * 状态
      */
-    @TableField(value = "enable")
+    @TableField(value = "status")
     @ApiModelProperty(value="状态")
-    private Integer enable;
+    private Integer status;
     /**
      * 父
@@ -386,6 +394,9 @@ public class ShipmentContainerHeader implements Serializable {
     public static final String COL_CONTAINERCODE = "containerCode";
+    public static final String COL_LOCATIONCODE = "locationCode";
+
+
     public static final String COL_WAREHOUSECODE = "warehouseCode";
     public static final String COL_CONTAINERTYPE = "containerType";
@@ -526,6 +537,14 @@ public class ShipmentContainerHeader implements Serializable {
         this.containerCode = containerCode;
     }
+    public String getLocationCode() {
+        return locationCode;
+    }
+
+    public void setLocationCode(String locationCode) {
+        this.locationCode = locationCode;
+    }
+
     /**
      * 获取仓库
      *
@@ -562,22 +581,12 @@ public class ShipmentContainerHeader implements Serializable {
         this.containerType = containerType;
     }
-    /**
-     * 获取状态
-     *
-     * @return enable - 状态
-     */
-    public Integer getEnable() {
-        return enable;
+    public Integer getStatus() {
+        return status;
     }
-    /**
-     * 设置状态
-     *
-     * @param enable 状态
-     */
-    public void setEnable(Integer enable) {
-        this.enable = enable;
+    public void setStatus(Integer status) {
+        this.status = status;
     }
     /**
 package com.huaheng.pc.shipment.shipmentContainerHeader.service;
 import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.shipment.shipmentContainerDetail.domain.ShipmentContainerDetail;
 import com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentCombinationModel;
 import com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentContainerHeader;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.apache.ibatis.annotations.Param;
+import java.util.List;
 import java.util.Map;
 public interface ShipmentContainerHeaderService extends IService<ShipmentContainerHeader>{
@@ -14,7 +16,14 @@ public interface ShipmentContainerHeaderService extends IService&lt;ShipmentContain
     //出库保存组盘
-    AjaxResult combination(ShipmentCombinationModel shipmentCombination);
+    ShipmentContainerHeader combination(ShipmentCombinationModel shipmentCombination);
+
+    //取消组盘
+    AjaxResult cancelCombinationDetail(List<Integer> detailIds) ;
+
+    AjaxResult cancelCombinationDetailInner(List<ShipmentContainerDetail> shipmentContainerDetails) ;
+
+    AjaxResult autoCombination(String shipmentCode);
 }
@@ -18,10 +18,13 @@ import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
 import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
 import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
 import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
+import com.huaheng.pc.shipment.shippingCombination.domain.ShippingSearch;
+import com.huaheng.pc.shipment.shippingCombination.service.ShippingCombinationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -48,6 +51,8 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
     private ShipmentContainerDetailService shipmentContainerDetailService;
     @Autowired
     private MaterialService materialService;
+    @Autowired
+    private ShippingCombinationService shippingCombinationService;
     @Override
@@ -64,30 +69,30 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
      */
     @Transactional
     @Override
-    public AjaxResult combination(ShipmentCombinationModel shipmentCombinationModel) {
+    public ShipmentContainerHeader combination(ShipmentCombinationModel shipmentCombinationModel) {
         //校验
         if(shipmentCombinationModel.getShipQty().compareTo(new BigDecimal("0")) <= 0){
-            return AjaxResult.error("出库数量必须大于0");
+            throw new ServiceException("出库数量必须大于0");
         }
         ShipmentDetail shipmentDetail = shipmentDetailService.getById(shipmentCombinationModel.getShipmentDetailId());
         if(shipmentDetail==null){
-            return AjaxResult.error("出库明细未找到");
+            throw new ServiceException("出库明细未找到");
         }
         InventoryDetail inventoryDetail = inventoryDetailService.getById((shipmentCombinationModel.getInventoryDetailId()));
         if(inventoryDetail==null){
-            return AjaxResult.error("库存未找到");
+            throw new ServiceException("库存未找到");
         }
         //校验数量是否超出
         if((shipmentDetail.getShipQty().subtract(shipmentDetail.getRequestQty())).compareTo(shipmentCombinationModel.getShipQty())<0){
-            return AjaxResult.error("录入数量超出明细待出数量");
+            throw new ServiceException("录入数量超出明细待出数量");
         }
         //校验库存可用数量
         if(inventoryDetail.getQty().subtract(inventoryDetail.getTaskQty()).subtract(inventoryDetail.getLockedQty()).compareTo(shipmentCombinationModel.getShipQty())<0){
-            return AjaxResult.error("录入数量超出可出数量");
+            throw new ServiceException("录入数量超出可出数量");
         }
         if(!shipmentDetail.getMaterialCode().equals(inventoryDetail.getMaterialCode())){
-            return AjaxResult.error("配盘物料不一致");
+            throw new ServiceException("配盘物料不一致");
         }
         //库位
         LambdaQueryWrapper<Location> lambdaQueryWrapper= Wrappers.lambdaQuery();
@@ -95,7 +100,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
                 .eq(Location::getCode,inventoryDetail.getLocationCode());
         Location location = locationService.getOne(lambdaQueryWrapper);
         if (location == null)
-            return AjaxResult.error("库位 "+ inventoryDetail.getLocationCode() +" 不存在");
+            throw new ServiceException("库位 "+ inventoryDetail.getLocationCode() +" 不存在");
         if (location.getStatus().equals("lock"))    {
             //如果库位状态是锁定的话，就查找出库组盘表，如果存在未下发
             LambdaQueryWrapper<ShipmentContainerHeader> lam=Wrappers.lambdaQuery();
@@ -104,7 +109,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
                     .eq(ShipmentContainerHeader::getTaskCreated,0);
             ShipmentContainerHeader shipmentContainerHeader = this.getOne(lam);
             if (shipmentContainerHeader == null)    {
-                return AjaxResult.error("库位已经锁定不能使用");
+                throw new ServiceException("库位已经锁定不能使用");
             }
         }
@@ -141,7 +146,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
         //更新单据状态
         shipmentHeaderService.updateShipmentStatus(shipmentDetail.getShipmentId());
-        return  AjaxResult.success("成功");
+        return  shipmentContainerHeader;
     }
     /**
@@ -157,7 +162,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
         lambdaQueryWrapper.eq(ShipmentContainerHeader::getContainerCode,location.getContainerCode())
                 .eq(ShipmentContainerHeader::getWarehouseCode,ShiroUtils.getWarehouseCode())
                 .eq(ShipmentContainerHeader::getTaskCreated,1)
-                .eq(ShipmentContainerHeader::getEnable,10);
+                .eq(ShipmentContainerHeader::getStatus,10);
         ShipmentContainerHeader shipmentContainerHeader = this.getOne(lambdaQueryWrapper);
         if(shipmentContainerHeader != null)  {
             throw new ServiceException("容器"+location.getContainerCode()+"已经生成任务，不能再添加明细;操作中止；");
@@ -167,7 +172,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
             lam.eq(ShipmentContainerHeader::getContainerCode,location.getContainerCode())
                     .eq(ShipmentContainerHeader::getWarehouseCode,ShiroUtils.getWarehouseCode())
                     .eq(ShipmentContainerHeader::getTaskCreated,0)
-                    .eq(ShipmentContainerHeader::getEnable,0);
+                    .eq(ShipmentContainerHeader::getStatus,0);
             shipmentContainerHeader = this.getOne(lam);
             if (shipmentContainerHeader == null) {
                 shipmentContainerHeader = new ShipmentContainerHeader();
@@ -175,7 +180,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
                 shipmentContainerHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
                 //赋值u8仓库
                 shipmentContainerHeader.setCompanyCode(shipmentDetail.getCompanyCode());
-                shipmentContainerHeader.setEnable(0);
+                shipmentContainerHeader.setStatus(0);
                 shipmentContainerHeader.setCreatedBy(ShiroUtils.getLoginName());
                 shipmentContainerHeader.setCreated(null);
 //            Material material=new Material();
@@ -230,4 +235,132 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
         return shipmentContainerDetail;
     }
+
+    /**
+     * 取消组盘的一组明细
+     * @param detailIds
+     * @return
+     */
+    @Override
+    public AjaxResult cancelCombinationDetail(List<Integer> detailIds)  {
+        List<ShipmentContainerDetail> shipmentContainerDetails = new ArrayList<>();
+        for(int detailId:detailIds){
+            ShipmentContainerDetail shipmentContainerDetail = shipmentContainerDetailService.getById(detailId);
+            shipmentContainerDetails.add(shipmentContainerDetail);
+        }
+        return cancelCombinationDetailInner(shipmentContainerDetails);
+    }
+
+    /**
+     * 取消组盘的一组明细
+     * @param shipmentContainerDetails
+     * @return
+     */
+    @Override
+    @Transactional
+    public AjaxResult cancelCombinationDetailInner(List<ShipmentContainerDetail> shipmentContainerDetails)  {
+        for(ShipmentContainerDetail shipmentContainerDetail:shipmentContainerDetails){
+            //获取头
+            ShipmentContainerHeader shipmentContainerHeader = this.getById(shipmentContainerDetail.getShippingContainerId());
+            if(shipmentContainerHeader.getStatus()>9){
+                return AjaxResult.error("容器"+shipmentContainerHeader.getContainerCode()+"非新建状态，不允许取消明细");
+            }
+            //恢复占用库存
+            InventoryDetail inventoryDetail = inventoryDetailService.getById(shipmentContainerDetail.getInventoryId());
+            inventoryDetail.setTaskQty(inventoryDetail.getTaskQty().subtract(shipmentContainerDetail.getQty()));
+            inventoryDetailService.saveOrUpdate(inventoryDetail);
+            //恢复单据发货数量
+            ShipmentDetail shipmentDetail = shipmentDetailService.getById(shipmentContainerDetail.getShipmentDetailId());
+            shipmentDetail.setRequestQty(shipmentDetail.getRequestQty().subtract(shipmentContainerDetail.getQty()));
+            if(shipmentDetail.getRequestQty().compareTo(BigDecimal.ZERO) != 0 ){
+                shipmentDetail.setStatus(200);//明细状态恢复,如果删除后还有以出数量就是波次
+            }else{
+                shipmentDetail.setStatus(0 );//明细状态
+            }
+            shipmentDetailService.saveOrUpdate(shipmentDetail);
+            //删除这个配盘明细
+            shipmentContainerDetailService.removeById(shipmentContainerDetail.getId());
+
+            //查询头表下还有没有明细，如果没有，则删了这个头表
+            ShipmentContainerDetail condition = new ShipmentContainerDetail();
+            condition.setShippingContainerId(shipmentContainerDetail.getShippingContainerId());
+            List<Map<String, Object>> list= shipmentContainerDetailService.selectListMapByEqual("id", condition);
+            if(list==null||list.size() == 0){
+                this.removeById(shipmentContainerHeader.getId());
+                locationService.updateStatus(shipmentContainerHeader.getLocationCode(),"empty");
+            }
+            //更新单据状态
+            shipmentHeaderService.updateShipmentStatus(shipmentDetail.getShipmentId());
+        }
+        return AjaxResult.success("");
+    }
+
+
+    /**
+     *  出库自动组盘
+     * @param shipmentCode
+     * @return
+     */
+    @Override
+    @Transactional
+    public AjaxResult autoCombination(String shipmentCode) {
+        int num=0;
+        AjaxResult ajaxResult=new AjaxResult();
+
+        LambdaQueryWrapper<ShipmentDetail> lambdaQueryWrapper=Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(ShipmentDetail::getShipmentCode,shipmentCode)
+                .eq(ShipmentDetail::getWarehouseCode,ShiroUtils.getWarehouseCode());
+        List<ShipmentDetail> shipmentDetailList = shipmentDetailService.list(lambdaQueryWrapper);
+        if(shipmentDetailList.size()<1 || shipmentDetailList==null){
+            return AjaxResult.error("找不到子单链");
+        }
+        for (ShipmentDetail item : shipmentDetailList) {
+            //获取需要出库数量
+            BigDecimal shipmentQty = item.getShipQty().subtract(item.getRequestQty());
+            //判断是否还有需要出库的物料，如果没有就跳过该物料
+            if (shipmentQty.compareTo(BigDecimal.ZERO) <= 0) {
+                continue;
+            }
+            // 根据 仓库编码、货主编码、存货编码，物料状态，项目号来查找可以出库的物料
+            ShippingSearch search = new ShippingSearch();
+            search.setWarehouseCode(ShiroUtils.getWarehouseCode());
+            search.setCompanyCode(item.getCompanyCode());
+            search.setMaterialCode(item.getMaterialCode());
+            search.setInventorySts(item.getInventorySts()); //物料状态
+
+            List<InventoryDetail> inventoryList = shippingCombinationService.getInventorys(search);
+            if (inventoryList.size() < 1) {
+                num = num + 1;
+            } else {
+                for (InventoryDetail inventory : inventoryList) {
+                    //判断是否组盘完毕，完毕就退出内循环
+                    if (shipmentQty.compareTo(BigDecimal.ZERO) <= 0) {
+                        break;
+                    }
+
+                    BigDecimal inventoryQty = inventory.getQty().subtract(inventory.getTaskQty());
+                    ShipmentCombinationModel shipmentCombination = new ShipmentCombinationModel();
+                    shipmentCombination.setInventoryDetailId(inventory.getId());
+                    shipmentCombination.setShipmentDetailId(item.getId());
+                    shipmentCombination.setType((short) 300);
+                    List<Integer> list=new ArrayList<>();
+                    //如果库存数 >= 待出库数，组盘数就是待出库数并且结束组盘，否则组盘数就是库存数
+                    if (inventoryQty.compareTo(shipmentQty) > -1) {
+                        shipmentCombination.setShipQty(shipmentQty);
+                        ShipmentContainerHeader shipmentContainerHeader=this.combination(shipmentCombination);
+                    } else {
+                        shipmentCombination.setShipQty(inventoryQty);
+                        ShipmentContainerHeader shipmentContainerHeader=this.combination(shipmentCombination);
+                        list.add(shipmentContainerHeader.getId());
+                    }
+                    shipmentQty = shipmentQty.subtract(shipmentCombination.getShipQty());
+                }
+            }
+        }
+        if(num==shipmentDetailList.size()){
+            throw new ServiceException("单据物料在此库区没有库存,无法出库");
+        }
+        return AjaxResult.success("");
+    }
+
 }
@@ -13,6 +13,7 @@ import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
 import com.huaheng.pc.shipment.shipmentContainerDetail.service.ShipmentContainerDetailService;
 import com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentCombinationModel;
+import com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentContainerHeader;
 import com.huaheng.pc.shipment.shipmentContainerHeader.service.ShipmentContainerHeaderService;
 import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
 import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailServiceImpl;
@@ -122,36 +123,36 @@ public class ShippingCombinationController extends BaseController {
     @PostMapping("/Addcombination")
     @ResponseBody
     public AjaxResult Addcombination(ShipmentCombinationModel shipmentCombinationModel){
-        AjaxResult ajaxResult = shipmentContainerHeaderService.combination(shipmentCombinationModel);
-        return  ajaxResult;
+        ShipmentContainerHeader shipmentContainerHeader= shipmentContainerHeaderService.combination(shipmentCombinationModel);
+        return  AjaxResult.success(shipmentContainerHeader.getId());
     }
-//    /**
-//     * 自动组盘
-//     * @param shipmentCode
-//     * @return
-//     */
-//    @RequiresPermissions("shipment:shippingCombination:combination")
-//    @PostMapping("/autoCombination")
-//    @ResponseBody
-//    public AjaxResult autoCombination(String shipmentCode){
-//        AjaxResult ajaxResult = shipmentContainerHeaderService.autoCombination(shipmentCode);
-//        return ajaxResult;
-//    }
-
-
-
-//    /** 取消组盘
-//     *
-//     * @param shipmentContainerDetailIds
-//     * @return
-//     */
-//    @RequiresPermissions("shipment:shippingCombination:remove")
-//    @PostMapping("/cancelCombination")
-//    @ResponseBody
-//    public AjaxResult cancelCombination(@RequestBody List<Integer> shipmentContainerDetailIds){
-//        return shipmentContainerHeaderService.cancelCombinationDetail(shipmentContainerDetailIds);
-//    }
+    /**
+     * 自动组盘
+     * @param shipmentCode
+     * @return
+     */
+    @RequiresPermissions("shipment:shippingCombination:combination")
+    @PostMapping("/autoCombination")
+    @ResponseBody
+    public AjaxResult autoCombination(String shipmentCode){
+        AjaxResult ajaxResult = shipmentContainerHeaderService.autoCombination(shipmentCode);
+        return ajaxResult;
+    }
+
+
+
+    /** 取消组盘
+     *
+     * @param shipmentContainerDetailIds
+     * @return
+     */
+    @RequiresPermissions("shipment:shippingCombination:remove")
+    @PostMapping("/cancelCombination")
+    @ResponseBody
+    public AjaxResult cancelCombination(@RequestBody List<Integer> shipmentContainerDetailIds){
+        return shipmentContainerHeaderService.cancelCombinationDetail(shipmentContainerDetailIds);
+    }
 }
 package com.huaheng.pc.shipment.shippingCombination.mapper;
+import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
+import com.huaheng.pc.shipment.shippingCombination.domain.ShippingSearch;
+
+import java.util.List;
+
 public interface ShippingCombinationMapper {
+    List<InventoryDetail> getInventorys(ShippingSearch search);
+
 }
 package com.huaheng.pc.shipment.shippingCombination.service;
+import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
+import com.huaheng.pc.shipment.shippingCombination.domain.ShippingSearch;
+import com.huaheng.pc.shipment.shippingCombination.mapper.ShippingCombinationMapper;
 import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+
 @Service
 public class ShippingCombinationService {
+    @Resource
+    private ShippingCombinationMapper shippingCombinationMapper;
+
+
+    public List<InventoryDetail> getInventorys(ShippingSearch search) {
+        List<InventoryDetail> list = shippingCombinationMapper.getInventorys(search);
+        return list;
+    }
+
 }
@@ -38,4 +38,8 @@
     version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, 
     systemCreated
   </sql>
+
+  <update id="updateStatus">
+        UPDATE location set `status`=#{status} WHERE warehouseCode=#{warehouseCode} AND `code`=#{code}
+    </update>
 </mapper>
 \ No newline at end of file
+<?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.huaheng.pc.shipment.shippingCombination.mapper.ShippingCombinationMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.shippingCombination.domain.ShippingSearch">
+    <!--@mbg.generated-->
+    <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
+    <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="materialCode" jdbcType="VARCHAR" property="materialCode" />
+    <result column="locationCode" jdbcType="VARCHAR" property="locationCode" />
+    <result column="containerCode" jdbcType="VARCHAR" property="containerCode" />
+    <result column="inventorySts" jdbcType="VARCHAR" property="inventorySts" />
+    <result column="project" jdbcType="VARCHAR" property="project" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+     warehouseCode, companyCode, code, materialCode, locationCode, `containerCode`, inventorySts,
+    project
+  </sql>
+
+  <select id="getInventorys" resultType="com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail">
+    SELECT i.id, i.warehouseId, i.warehouseCode, i.locationId, i.locationCode, i.containerCode,
+    i.sourceCode, i.sourceLine, i.companyId, i.companyCode, i.materialId, i.materialCode,
+    i.receiptId, i.receiptCode,	i.receiptDetailId, i.batch, i.lot, i.project, i.manufactureDate,
+    i.expirationDate, i.status, i.qty, i.taskQty, i.costPrice, i.listPrice, i.netPrice, i.created,
+    i.createdBy, i.lastUpdated, i.lastUpdatedBy, i.userDef1, i.userDef2, i.userDef3, i.deleted,
+    m.name materialName, m.userDef1 materialOldCode ,i.zoneCode
+    FROM inventory i
+    INNER JOIN material m ON i.materialCode = m.code
+    AND i.companyCode=#{companyCode}
+    AND i.warehouseCode=#{warehouseCode}
+    AND m.warehouseCode=#{warehouseCode}
+    AND i.qty > i.taskQty
+    AND i.materialCode=#{materialCode}
+
+    INNER JOIN location l ON i.locationCode = l.code
+    AND l.warehouseCode=#{warehouseCode}
+    LEFT JOIN shipment_container_header s ON i.locationCode = s.locationCode
+    AND s.status=0
+    AND s.warehouseCode=#{warehouseCode}
+    <where>
+      <if test="project != null and project != ''">
+        AND i.project = #{project}
+      </if>
+      <if test="inventoryStatus != null and inventoryStatus != '' ">
+        AND i.status = #{inventoryStatus}
+      </if>
+      <if test="locationCode != null and locationCode != '' ">
+        AND i.locationCode = #{locationCode}
+      </if>
+      <if test="containerCode != null and containerCode != '' ">
+        AND i.containerCode = #{containerCode}
+      </if>
+      <if test="params != null and params.createdBegin != null and params.createdBegin != ''">
+        AND i.created &gt;= #{params.createdBegin}
+      </if>
+      <if test="params != null and params.createdEnd != null and params.createdEnd != ''">
+        AND i.created &lt;= #{params.createdEnd}
+      </if>
+      AND  l.status='empty' OR (l.status='lock' AND s.id  IS NOT NULL)
+    </where>
+  </select>
+</mapper>
 \ No newline at end of file
@@ -67,4 +67,47 @@
     version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, 
     processStamp
   </sql>
+
+  <select id="selectListMapByEqual" resultType="java.util.HashMap">
+    SELECT ${columns} FROM shipment_container_detail
+    <where>
+      <if test="condition.id != null">
+        AND id = #{condition.id}
+      </if>
+      <if test="condition.headerId != null">
+        AND headerId = #{condition.headerId}
+      </if>
+      <if test="condition.shipmentCode != null">
+        AND shipmentCode = #{condition.shipmentCode}
+      </if>
+      <if test="condition.shipmentHeaderId != null">
+        AND shipmentHeaderId = #{condition.shipmentHeaderId}
+      </if>
+      <if test="condition.shipmentDetailId != null">
+        AND shipmentDetailId = #{condition.shipmentDetailId}
+      </if>
+      <if test="condition.materialCode != null">
+        AND materialCode = #{condition.materialCode}
+      </if>
+      <if test="condition.materialName != null">
+        AND materialName = #{condition.materialName}
+      </if>
+      <if test="condition.qty != null">
+        AND qty = #{condition.qty}
+      </if>
+      <if test="condition.inventoryId != null">
+        AND inventoryId = #{condition.inventoryId}
+      </if>
+      <if test="condition.created != null">
+        AND created = #{condition.created}
+      </if>
+      <if test="condition.createdBy != null">
+        AND createdBy = #{condition.createdBy}
+      </if>
+      <if test="condition.project != null">
+        AND project = #{condition.project}
+      </if>
+    </where>
+  </select>
+
 </mapper>
 \ No newline at end of file
@@ -7,7 +7,7 @@
     <result column="containerCode" jdbcType="VARCHAR" property="containerCode" />
     <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
     <result column="containerType" jdbcType="VARCHAR" property="containerType" />
-    <result column="enable" jdbcType="INTEGER" property="enable" />
+    <result column="enable" jdbcType="INTEGER" property="status" />
     <result column="parent" jdbcType="INTEGER" property="parent" />
     <result column="totalWeight" jdbcType="DECIMAL" property="totalWeight" />
     <result column="totalVolume" jdbcType="DECIMAL" property="totalVolume" />