增加单据页面单位

zyx

2024-03-01 fe7247af6af58cbc8ea2526e8aa4eedaf545de6c

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -10,13 +10,11 @@
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.MobileAdjustNewParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.OffSaleParam;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.SaasUtils;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.DetlDto;
import com.zy.common.service.CommonService;
import com.zy.common.utils.Synchro;
@@ -665,7 +663,8 @@
            }
            orderService.checkComplete(order.getOrderNo());

            SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername());
            SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),
        null,null,null,null,null);
        }


@@ -806,7 +805,8 @@
                    return R.error("更新平库库存状态失败");
                }
            }
            SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername());
            SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),
                    null,null,null,null,null);

        }
        return R.ok("下架完成");
@@ -1207,23 +1207,36 @@
    }

    @Override
    public void plaPakin(String locNo, String batch, String packageNo) {
    public void plaPakin(String locNo, String batch, Integer packageNo,User user) {
        Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);
        if(!pla.getLocNo().equals(locNo)){
            throw new CoolException("该物料入库的库位错误");
        if(Cools.isEmpty(pla)){
            throw new CoolException("系统未检测到该包物料信息，请重新录入");
        }
        if("已入库".equals(pla.getStatus())){
            throw new CoolException("该物料已入库");

        if(!pla.getStatus().equals(GlobleParameter.PLA_STATUS_0)){
            throw new CoolException("该物料状态不为待入库，无法入库");
        }
        pla.setStatus("已入库");

        pla.setStatus(GlobleParameter.PLA_STATUS_1);
        pla.setModifyTime(new Date());
        pla.setPakinTime(new Date());

        Node node = nodeService.selectByUuid(locNo);
        if(Cools.isEmpty(node)){
            throw new CoolException("库位信息不正确");
        }

        pla.setStash(node.getParentName());
        pla.setLocNo(node.getUuid());

        plaService.updateById(pla);
        SaasUtils.insertLog(0,locNo,batch+","+packageNo,pla.getWeightAnfme(),null);
        SaasUtils.insertLog(0,locNo,pla.getBrand(),pla.getWeightAnfme(),user.getUsername(),
                null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
    }

    @Override
    @Transactional
    public void plaPakout(String locNo, String batch, String packageNo, String orderNo, String orderDetlId, String wrkNo, Double anfme) {
    public void plaPakout(String locNo, String batch, Integer packageNo, String orderNo, String orderDetlId, String wrkNo, Double anfme) {
        Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);

        ManPakOut manPakOut = manPakOutService.selectById(wrkNo);
@@ -1243,16 +1256,36 @@
            manPakOutService.updateById(manPakOut);
        }

        //更新plaQty信息
        plaQty.setPakoutTime(Utils.getDateStr(new Date()));
        plaQtyService.updateById(plaQty);

        //更新pla明细
        pla.setWeightAnfme(pla.getWeightAnfme() - anfme);
        pla.setQtyAnfme(pla.getQtyAnfme() - anfme);
        pla.setModifyTime(new Date());
        if(pla.getWeightAnfme() <= 0){
            pla.setStatus("全部出库");
            pla.setStatus(GlobleParameter.PLA_STATUS_4);
        }else {
            pla.setStatus("部分出库");
            pla.setStatus(GlobleParameter.PLA_STATUS_3);
        }
        plaService.updateById(pla);
        SaasUtils.insertLog(1,locNo,batch+","+packageNo,anfme,null);
        SaasUtils.insertLog(1,locNo,pla.getBrand(),anfme,null,null,
                pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());

        //更新订单明细
        Order order = orderService.selectByNo(orderNo);
        OrderDetl orderDetl = orderDetlService.selectById(plaQty.getOrderDetlId());

        orderDetl.setQty(orderDetl.getQty() + anfme);
        orderDetlService.updateById(orderDetl);

        orderService.checkComplete(orderNo);

    }

    @Override
    public List<ManPakOut> getManPakoutByOrderNo(String orderNo) {
        return manPakOutService.selectList(new EntityWrapper<ManPakOut>().eq("doc_num",orderNo).eq("status",0));
    }
}