# 导入订单增加单据类型

whycq

2023-08-26 82bcd0328dddbaad65933e2fada22bc68e82b3d5

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

@@ -11,7 +11,9 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkMast;
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 +28,9 @@

    @Autowired
    private WaitPakinService waitPakinService;

    @Autowired
    private WrkMastService wrkMastService;

    @RequestMapping(value = "/waitPakin/{id}/auth")
    @ManagerAuth
@@ -73,7 +78,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 +93,13 @@
            return R.error();
        }
        for (WaitPakin entity : list){
            waitPakinService.delete(new EntityWrapper<>(entity));
            WrkMast wrkMast = wrkMastService.selectByBarcode(entity.getBarcode());
            if (Cools.isEmpty(wrkMast)) {
                waitPakinService.delete(new EntityWrapper<>(entity));
            } else {
                return R.error("工作档数据已存在,无法删除！！");
            }

        }
        return R.ok();
    }
@@ -113,8 +124,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);