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

pjb

2024-12-31 c4e8e814d2c9e0d03f6449860b70e58657fd7dc2

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

@@ -58,7 +58,7 @@
       List<Pakout> pakouts = selectList(new EntityWrapper<Pakout>().eq("doc_num", docNum));
       for (Pakout pakout: pakouts){

           Pla pla = plaService.selectByBatchAndPackageNo(pakout.getBatch(), pakout.getBarcode());
           Pla pla = plaService.selectByBatchAndPackageNo(pakout.getBatch(), Integer.parseInt(pakout.getBarcode()), pakout.getMaktx());
           if(!Cools.isEmpty(pla)){
               pla.setQtyAnfme(pla.getQtyAnfme() - pakout.getAnfme());
               pla.setModifyTime(new Date());
@@ -116,7 +116,7 @@
        }

        //更新pla信息
        Pla pla = plaService.selectByBatchAndPackageNo(pakout.getBatch(), pakout.getBarcode());
        Pla pla = plaService.selectByBatchAndPackageNo(pakout.getBatch(), Integer.parseInt(pakout.getBarcode()),pakout.getMaktx());
        pla.setQtyAnfme(pla.getQtyAnfme() - pakout.getAnfme());
        pla.setStatus(GlobleParameter.PLA_STATUS_1);
        pla.setModifyTime(new Date());