拣货单

zyx

2023-09-24 c832c7f5d6f8c015d609e044e902e070da5240b0

 src/main/java/com/zy/asrs/controller/MobileController.java

@@ -8,10 +8,13 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.NodePakoutParam;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.service.*;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
import com.zy.system.entity.User;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody;
@@ -48,7 +51,11 @@
    @Autowired
    private PackService packService;
    @Autowired
    private ManLocDetlService manLocDetlService;
    private ManLocDetlTempService manLocDetlTempService;
    @Autowired
    private MatService matService;
    @Autowired
    private WaitPakinService waitPakinService;

    // 组托 ----------------------------------------------------------------------------------------------------

@@ -90,8 +97,8 @@
                        combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getQty());
                        combMat.setMaktx(orderDetl.getMaktx());
                        combMat.setSpecs(orderDetl.getSpecs());
                        combMat.setCsocode(orderDetl.getColor());
                        combMat.setIsoseq(orderDetl.getOrigin());
                        combMat.setCsocode(orderDetl.getThreeCode());
                        combMat.setIsoseq(orderDetl.getDeadTime());
                        combMats.add(combMat);
                    }
                    combParam.setCombMats(combMats);
@@ -327,25 +334,74 @@
     */
    @RequestMapping("/node/recommend/loc")
    @ManagerAuth(memo = "库位推荐")
    public R recommendNodeLoc(){
    public R recommendNodeLoc(@RequestBody HashMap<String,String> param){

        String zpallet = param.get("zpallet");

        return R.ok();
        return R.ok("DT-C-010202").add(waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet",zpallet)));
    }


    /*
    平库 订单上架
     */
    @RequestMapping("/node/puttway")
    @ManagerAuth(memo = "订单上架")
    //@ManagerAuth(memo = "订单上架")
    public R putway(@RequestBody HashMap<String,String> params){
        String zpallet = params.get("zpallet");
        String locNo = params.get("locNo");

        mobileService.nodePutway(zpallet,locNo,getUser());
        mobileService.nodePutway(zpallet,locNo,new User());

        return R.ok("订单上架成功");
    }

    /*
    平库 订单下架
     */
    @RequestMapping("/node/pakout")
    public R nodePakout(@RequestBody NodePakoutParam param){


        return R.ok();
        mobileService.nodePakout(param,new User());

        return R.ok("订单下架成功");
    }

    /*
    平库临时上架
     */
    @RequestMapping("/node/putway1")
    public R putway1(@RequestBody CombParam combParam){
        Date now = new Date();
        List<CombParam.CombMat> combMats = combParam.getCombMats();
        combMats.forEach(combMat -> {
            if(Cools.isEmpty(combMat.getBatch())){
                combMat.setBatch("-1");
            }
            ManLocDetlTemp manLocDetlTemp = manLocDetlTempService.selectOne(new EntityWrapper<ManLocDetlTemp>()
                    .eq("matnr", combMat.getMatnr())
                    .eq("batch",combMat.getBatch()));
            if(Cools.isEmpty(manLocDetlTemp)){
                manLocDetlTemp = new ManLocDetlTemp();
                Mat mat = matService.selectByMatnr(combMat.getMatnr());
                BeanUtils.copyProperties(mat,manLocDetlTemp);
                manLocDetlTemp.setLocNo("A-010101");
                manLocDetlTemp.setAnfme(combMat.getAnfme());
                manLocDetlTemp.setBatch(combMat.getBatch());
                manLocDetlTemp.setCreateTime(now);
                manLocDetlTemp.setModiTime(now);
                manLocDetlTempService.insert(manLocDetlTemp);
            }else {
                manLocDetlTemp.setAnfme(manLocDetlTemp.getAnfme()+combMat.getAnfme());
                manLocDetlTempService.update(manLocDetlTemp,new EntityWrapper<ManLocDetlTemp>()
                        .eq("matnr", combMat.getMatnr())
                        .eq("batch",combMat.getBatch()));
            }

        });

        return R.ok("上架成功");
    }