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

whycq

2024-07-04 c1a75fbe8a68c9e4dfd2c161375dc325a5c13989

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

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

@@ -605,4 +605,11 @@
        return R.ok();
    }

    @RequestMapping("/adjustNew/v2/auth")
    @ManagerAuth(memo = "补货")
    public synchronized R adjustNewV2(@RequestBody MobileAdjustParam combParam){
        mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
        return R.ok("补货成功");
    }

}

 src/main/java/com/zy/asrs/entity/param/MobileAdjustParam.java

@@ -15,6 +15,8 @@

    private Integer wrkNo;

    private String barcode;

    private List<WrkDetl> wrkDetls;

}

 src/main/java/com/zy/asrs/service/MobileService.java

@@ -59,4 +59,6 @@
    R manDetlIn(JSONObject json);

    R manDetlOut(JSONObject json);

    void adjustNew(MobileAdjustParam param, Boolean re, Long userId);
}

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

@@ -1032,5 +1032,33 @@
        return R.ok("下架完成");
    }

    @Override
    @Transactional
    public void adjustNew(MobileAdjustParam param, Boolean re, Long userId) {
        Date now = new Date();
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
        if (Cools.isEmpty(wrkMast)){
            throw new CoolException("托盘码:"+param.getBarcode()+" 无有效工作档");
        }else if (wrkMast.getIoType()!=103){
            throw new CoolException("托盘码:"+param.getBarcode()+" 所属工作档非拣料任务");
        }else if (wrkMast.getWrkSts()!=14.0){
            throw new CoolException("托盘码:"+param.getBarcode()+" 所属工作档工作状态不是出库完成");
        }
//        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));

        List<WrkDetl> wrkDetls = param.getWrkDetls();
        for (WrkDetl wrkDetl : wrkDetls) {
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            wrkDetl.setZpallet(param.getBarcode());
            wrkDetl.setMatnr("B"+wrkDetl.getMatnr());
            wrkDetl.setAnfme(-wrkDetl.getAnfme());
            wrkDetl.setAppeTime(now);
            wrkDetl.setAppeUser(userId);
            wrkDetl.setModiTime(now);
            wrkDetl.setModiUser(userId);
            wrkDetlService.insert(wrkDetl);
        }

    }

}

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

@@ -271,6 +271,9 @@
            }
        }
        for (DetlDto detlDto : list) {
            if (detlDto.getMatnr().substring(0,1).equals("B")) {
               detlDto.setMatnr(detlDto.getMatnr().substring(1));
            };
            Mat mat = matService.selectByMatnr(detlDto.getMatnr());
            OrderDetl orderDetl = new OrderDetl();
            if (Cools.isEmpty(mat)) {

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

@@ -119,6 +119,7 @@
                throw new CoolException("修改单据状态失败");
            }
            for (DetlDto detlDto : detlDtos) {
                if (detlDto.getMatnr().substring(0,1).equals("B")) continue;
                // 修改订单明细数量
                if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
                    throw new CoolException("修改单据明细数量失败");

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
@@ -23,6 +24,9 @@
@Transactional
public class WorkMastHandler extends AbstractHandler<String> {


    @Autowired
    private MatService matService;
    @Autowired
    private WrkMastService wrkMastService;
    @Autowired
@@ -161,6 +165,10 @@
                        return FAIL.setMsg("拣料入库 ===>> 工作明细档为空; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                    }
                    for (WrkDetl wrkDetl : wrkDetls53) {
                        String matnr = wrkDetl.getMatnr();
                        if (matnr.substring(0,1).equals("B")) {
                            wrkDetl.setMatnr(matnr.substring(1));
                        }

                        LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        if (null != locDetl) {
@@ -169,6 +177,21 @@
                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                                return FAIL.setMsg("拣料入库 ===>> 修改库存明细数量失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                            }
                        } else {
                            LocDetl detl = new LocDetl();

//                            Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
//                            detl.sync(mat);
                            detl.sync(wrkDetl);
                            detl.setOrderNo(wrkDetl.getOrderNo());//订单编号
                            detl.setLocNo(wrkMast.getLocNo()); // 库位号
                            detl.setAnfme(Math.abs(wrkDetl.getAnfme())); // 数量
                            detl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
                            detl.setModiTime(now);
                            detl.setAppeTime(now);
                            if (!locDetlService.insert(detl)) {
                                return FAIL.setMsg("补料 ===>> 添加库存明细失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                            }
                        }

                        // 更新订单完成数量

 src/main/resources/mapper/WaitPakinLogMapper.xml

@@ -47,6 +47,7 @@
        <result column="appe_time" property="appeTime" />
        <result column="appe_user" property="appeUser" />
        <result column="memo" property="memo" />
        <result column="bom_code" property="bomCode" />
    </resultMap>

</mapper>

 src/main/resources/mapper/WrkDetlLogMapper.xml

@@ -45,6 +45,7 @@
        <result column="appe_user" property="appeUser" />
        <result column="appe_time" property="appeTime" />
        <result column="memo" property="memo" />
        <result column="bom_code" property="bomCode" />
    </resultMap>

</mapper>