| | |
| | | import com.core.common.R; |
| | | import com.core.exception.CoolException; |
| | | import com.zy.asrs.entity.*; |
| | | import com.zy.asrs.entity.param.CombParam; |
| | | import com.zy.asrs.entity.param.GDYKConfirmGoodsParam; |
| | | import com.zy.asrs.entity.param.MobileAdjustParam; |
| | | import com.zy.asrs.entity.param.OffSaleParam; |
| | | import com.zy.asrs.entity.param.*; |
| | | import com.zy.asrs.entity.result.MobileAdjustResult; |
| | | import com.zy.asrs.mapper.ManLocDetlMapper; |
| | | import com.zy.asrs.service.*; |
| | |
| | | return R.ok("组托成功"); |
| | | } |
| | | |
| | | @RequestMapping("/pickIn/auth") |
| | | // @ManagerAuth(memo="盘点入库") |
| | | public R pickIn(@RequestParam String barcode){ |
| | | WrkMast wrkMast = wrkMastService.selectByBarcode(barcode); |
| | | List<PickInParam> param = wrkDetlService.selectDetByBarcode(barcode); |
| | | for(PickInParam pickInParam : param){ |
| | | pickInParam.setStaNo(wrkMast.getStaNo()); |
| | | pickInParam.setWorkNo(wrkMast.getWrkNo()); |
| | | } |
| | | return R.ok().add(param); |
| | | } |
| | | |
| | | |
| | | @RequestMapping("/pack/get/auth") |
| | | @ManagerAuth |
| | | public R packGet(@RequestParam String barcode) { |
| | |
| | | @TableField("safe_qty") |
| | | private Double safeQty; |
| | | |
| | | @ApiModelProperty(value= "重量") |
| | | @ApiModelProperty(value= "整托重量") |
| | | private Double weight; |
| | | |
| | | @ApiModelProperty(value= "长度") |
New file |
| | |
| | | package com.zy.asrs.entity.param; |
| | | |
| | | import lombok.Data; |
| | | |
| | | @Data |
| | | public class PickInParam { |
| | | private Integer staNo; |
| | | private Integer workNo; |
| | | private String matnr; |
| | | private String maktx; |
| | | private Double anfme; |
| | | } |
| | |
| | | |
| | | import com.baomidou.mybatisplus.mapper.BaseMapper; |
| | | import com.zy.asrs.entity.WrkDetl; |
| | | import com.zy.asrs.entity.param.PickInParam; |
| | | import org.apache.ibatis.annotations.Mapper; |
| | | import org.apache.ibatis.annotations.Param; |
| | | import org.springframework.stereotype.Repository; |
| | |
| | | List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo); |
| | | |
| | | int updateIoTimeWms(@Param("workNo") Integer workNo, @Param("ioTime") Date ioTime); |
| | | List<PickInParam> selectDetByBarcode(@Param("barcode") String barcode); |
| | | } |
| | |
| | | |
| | | import com.baomidou.mybatisplus.service.IService; |
| | | import com.zy.asrs.entity.WrkDetl; |
| | | import com.zy.asrs.entity.param.PickInParam; |
| | | import com.zy.common.model.DetlDto; |
| | | |
| | | import java.util.Date; |
| | |
| | | List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo); |
| | | |
| | | boolean updateIoTimeWms(Integer wrkNo, Date now); |
| | | |
| | | List<PickInParam> selectDetByBarcode(String barcode); |
| | | } |
| | |
| | | } |
| | | LocTypeDto locTypeDto = new LocTypeDto(); |
| | | locTypeDto.setLocType1((short) 1); |
| | | return wcsController.startupFullPutStore(301, list.get(0).getZpallet(), locTypeDto, list); |
| | | return wcsController.startupFullPutStore(301, list.get(0).getZpallet(), 0.0, locTypeDto, list); |
| | | } |
| | | |
| | | @Override |
| | |
| | | import com.core.exception.CoolException; |
| | | import com.zy.asrs.entity.Mat; |
| | | import com.zy.asrs.entity.WrkDetl; |
| | | import com.zy.asrs.entity.param.PickInParam; |
| | | import com.zy.asrs.mapper.WrkDetlMapper; |
| | | import com.zy.asrs.service.MatService; |
| | | import com.zy.asrs.service.WrkDetlService; |
| | |
| | | |
| | | @Autowired |
| | | private MatService matService; |
| | | @Autowired |
| | | private WrkDetlService wrkDetlService; |
| | | @Autowired |
| | | private WrkDetlMapper wrkDetlMapper; |
| | | |
| | | @Override |
| | | @Transactional |
| | |
| | | public boolean updateIoTimeWms(Integer workNo, Date ioTime) { |
| | | return this.baseMapper.updateIoTimeWms(workNo, ioTime) > 0; |
| | | } |
| | | @Override |
| | | public List<PickInParam> selectDetByBarcode(String barcode){ |
| | | return this.baseMapper.selectDetByBarcode(barcode); |
| | | } |
| | | } |
| | |
| | | switch (param.getIoType()) { |
| | | case 1://满托盘入库 |
| | | assert waitPakins != null; |
| | | dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins); |
| | | dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(),param.getWeight(), locTypeDto, waitPakins); |
| | | break; |
| | | case 10://空托盘入库 |
| | | dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode()); |
| | |
| | | * 全板入库 |
| | | */ |
| | | @Transactional |
| | | public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) { |
| | | public StartupDto startupFullPutStore(Integer devpNo, String barcode,Double weight, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) { |
| | | // 源站点状态检测 |
| | | BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true); |
| | | // 检索库位 |
| | |
| | | wrkMast.setExitMk("N"); // 退出 |
| | | wrkMast.setEmptyMk("N"); // 空板 |
| | | wrkMast.setLinkMis("Y"); |
| | | wrkMast.setScWeight(weight); |
| | | wrkMast.setCtnType(sourceStaNo.getCtnType()); // 容器类型 |
| | | // 操作人员数据 |
| | | wrkMast.setAppeTime(now); |
| | |
| | | Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>() |
| | | .eq("zpallet", barcode); |
| | | WaitPakin setParam = new WaitPakin(); |
| | | setParam.setWeight(weight);//将整托重量记入通知档 |
| | | setParam.setLocNo(dto.getLocNo()); |
| | | setParam.setIoStatus("Y"); |
| | | setParam.setModiTime(now); |
| | |
| | | // 库位规格( 0:未知, 1:低库位, 2:高库位) |
| | | private Short locType1; |
| | | |
| | | private Double weight; |
| | | |
| | | } |
| | |
| | | where 1=1 |
| | | and wrk_no = #{workNo} |
| | | </update> |
| | | <resultMap id="PickInMap" type="com.zy.asrs.entity.param.PickInParam"> |
| | | <result column="matnr" property="matnr" /> |
| | | <result column="maktx" property="maktx" /> |
| | | <result column="anfme" property="anfme" /> |
| | | <result column="wrk_no" property="workNo"/> |
| | | </resultMap> |
| | | <select id="selectDetByBarcode" resultMap="PickInMap"> |
| | | select matnr,maktx,anfme,wrk_no |
| | | from asr_wrk_detl |
| | | where zpallet = #{barcode} |
| | | </select> |
| | | |
| | | </mapper> |