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

lsh

2025-09-11 da3bbf602cf91249b31c8b01eba0f5c2bf9edea7

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

@@ -11,9 +11,15 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.WaitPakinService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
@@ -26,6 +32,10 @@

    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private WrkMastService wrkMastService;

    @RequestMapping(value = "/waitPakin/{id}/auth")
    @ManagerAuth
@@ -82,13 +92,28 @@

    @RequestMapping(value = "/waitPakin/delete/auth")
    @ManagerAuth
    @Transactional
    public R delete(@RequestParam String param){
        List<WaitPakin> list = JSONArray.parseArray(param, WaitPakin.class);
        if (Cools.isEmpty(list)){
            return R.error();
            return R.error("数据为空");
        }
        for (WaitPakin entity : list){
            List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("barcode", entity.getZpallet()));
            if(!Cools.isEmpty(wrkMasts) || wrkMasts.size() > 0){
                return R.error("条码已生成入库工作档，禁止删除");
            }
            waitPakinService.delete(new EntityWrapper<>(entity));
            //订单关联，修改订单作业数量
            if (!Cools.isEmpty(entity.getOrderNo())) {
//                if (!orderDetlService.decrease(entity.getOrderNo(), entity.getMatnr(), entity.getBatch(), entity.getAnfme())) {
//                    return R.error("订单数据回滚失败");
//                }
                OrderInAndOutUtil.decrease(Boolean.TRUE, entity.getOrderNo(), entity.getMatnr(), entity.getBatch(),entity.getBrand()
                        ,entity.getStandby1(),entity.getStandby2(),entity.getStandby3()
                        ,entity.getBoxType1(),entity.getBoxType2(),entity.getBoxType3()
                        , entity.getAnfme());
            }
        }
        return R.ok();
    }