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

zc

2024-09-06 4d4a869fef836b96968eac9554b91604127076ca

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

 src/main/java/com/zy/common/web/WcsController.java

@@ -84,9 +84,12 @@
                return R.parse(CodeRes.NO_COMB_700);
            }
            int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
            if (countLoc > 0) {
                return R.error("库存条码数据已存在");
            }
            int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
            if (countLoc > 0 || countWrk > 0) {
                return R.error(CodeRes.EXIST_500);
            if (countWrk > 0) {
                return R.error("工作档已存在");
            }
        }
        if (Cools.isEmpty(param.getLocType1())) {

 src/main/resources/mapper/ApiLogMapper.xml

@@ -23,6 +23,8 @@
    </resultMap>

    <delete id="clearWeekBefore">


        delete from man_api_log
        where 1=1
        and datediff(week,create_time,getdate()) >= 1