src/main/java/com/zy/asrs/mapper/LocMastMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/WorkService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/common/web/WcsController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/LocMastMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -62,4 +62,12 @@ * @return 库位号 */ String findFirstFrozenLocNo(@Param("locNoList") List<String> locNoList); /** * 根据指定库位排号和库位状态获取一个满足条件的库位 * @param rowList 排号集合(为空则查询所有排) * @param locType 空拖类型 * @return 库位 */ LocMast queryLocMasterByLocStsAndRow(@Param("rowList") List<Integer> rowList,@Param("locType") String locType); } src/main/java/com/zy/asrs/service/WorkService.java
@@ -58,7 +58,7 @@ * @param param * @return */ public WrkMast emptyPlateOut(EmptyPlateOutParam param); WrkMast emptyPlateOut(EmptyPlateOutParam param); /** * 盘点出库 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -621,7 +621,7 @@ } for (String locNo : param.getLocNos()) { // 获取工作号 int workNo = commonService.getWorkNo(0); int workNo = commonService.getWorkNo(2); // 获取库位 LocMast locMast = locMastService.selectById(locNo); if (Cools.isEmpty(locMast)) { src/main/java/com/zy/common/web/WcsController.java
@@ -8,6 +8,7 @@ import com.zy.asrs.entity.*; import com.zy.asrs.entity.param.EmptyPlateOutParam; import com.zy.asrs.entity.result.FindLocNoAttributeVo; import com.zy.asrs.mapper.LocMastMapper; import com.zy.asrs.service.*; import com.zy.common.CodeRes; import com.zy.common.model.LocTypeDto; @@ -19,9 +20,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.Date; import java.util.List; import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; /** @@ -50,6 +50,9 @@ private RowLastnoService rowLastnoService; @Autowired private WorkService workService; @Resource private LocMastMapper locMastMapper; @PostMapping("/pakin/loc/v1") @ResponseBody @@ -142,15 +145,31 @@ @PostMapping("auto/emptyOut/v1") @ResponseBody public R autoEmptyOut(){ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>() .eq("loc_sts", "D")); if (Cools.isEmpty(locMast)) { return R.error("库存没有空板"); public R autoEmptyOut(@RequestBody Map<String,String> emptyPalletSite){ // 空托盘类型 String type = emptyPalletSite.get("flag"); // 出库站点 Integer site = Integer.valueOf(emptyPalletSite.get("site")); LocMast locMast; // 先找浅库位 locMast = locMastMapper.queryLocMasterByLocStsAndRow(Arrays.asList(2, 3), type); // 浅库位没有则查询所有 if (locMast == null) { locMast = locMastMapper.queryLocMasterByLocStsAndRow(null, type); } if (locMast == null) { return R.error("库存没有"+type+"类型空托盘"); } String locNo = locMast.getLocNo(); EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam(); emptyPlateOutParam.setOutSite(12); emptyPlateOutParam.setLocNos(new ArrayList<String>(){{add(locMast.getLocNo()+"");}}); emptyPlateOutParam.setOutSite(site); emptyPlateOutParam.setLocNos(new ArrayList<String>(){{add(locNo);}}); WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam); return R.ok(!Cools.isEmpty(wrkMast)? R.ok("自动空托出库成功,工作号:" + wrkMast.getWrkNo()) : R.error("生成自动空托出库失败")); } src/main/resources/mapper/LocMastMapper.xml
@@ -203,5 +203,22 @@ #{item} </foreach> </select> <select id="queryLocMasterByLocStsAndRow" resultMap="BaseResultMap"> select top 1 * from asr_loc_mast alm where alm.loc_sts = 'D' and loc_type = #{locType} <if test="rowList != null and !rowList.isEmpty()"> and alm.row1 in <foreach collection="rowList" item="item" open="(" close=")" separator=","> #{item} </foreach> </if> order by lev1,bay1,row1 </select> </mapper>