123

zhang

3 天以前 21d0e7ab9d5c7316225a3e9eecf465cd37c9bd85

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

@@ -10,8 +10,14 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.service.WaitPakinService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -26,6 +32,15 @@

    @Autowired
    private WaitPakinService waitPakinService;

    @Autowired
    private WrkMastService wrkMastService;

    @Autowired
    private OrderService orderService;

    @Autowired
    private OrderDetlService orderDetlService;

    @RequestMapping(value = "/waitPakin/{id}/auth")
    @ManagerAuth
@@ -73,7 +88,7 @@
   @RequestMapping(value = "/waitPakin/update/auth")
   @ManagerAuth
    public R update(WaitPakin waitPakin){
        if (Cools.isEmpty(waitPakin) || null==waitPakin.getId()){
        if (Cools.isEmpty(waitPakin)){
            return R.error();
        }
        waitPakinService.updateById(waitPakin);
@@ -88,7 +103,27 @@
            return R.error();
        }
        for (WaitPakin entity : list){
            waitPakinService.delete(new EntityWrapper<>(entity));
            WrkMast wrkMast = wrkMastService.selectByBarcode(entity.getBarcode());
            if (Cools.isEmpty(wrkMast)) {
                Order order = orderService.selectByNo(entity.getOrderNo());
                if (!Cools.isEmpty(order)) {
                    String matnr = entity.getMatnr();
                    Double anfme = entity.getAnfme();
                    List<OrderDetl> orderDetls = orderService.selectTotalDetls(order.getId());
                    for (OrderDetl orderDetl : orderDetls) {
                        if (matnr.equals(orderDetl.getMatnr())) {
                            orderDetl.setQty(orderDetl.getQty() - anfme);
                            orderDetlService.updateById(orderDetl);
                        }
                    }
                    waitPakinService.delete(new EntityWrapper<>(entity));
                } else {
                    waitPakinService.delete(new EntityWrapper<>(entity));
                }
            } else {
                return R.error("工作档数据已存在,无法删除！！");
            }

        }
        return R.ok();
    }
@@ -113,8 +148,8 @@
        List<Map<String, Object>> result = new ArrayList<>();
        for (WaitPakin waitPakin : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", waitPakin.getId());
            map.put("value", waitPakin.getId());
            map.put("id", waitPakin.getZpallet());
            map.put("value", waitPakin.getZpallet());
            result.add(map);
        }
        return R.ok(result);