实现多订单组托，并且在pda上区分配盘和来料入库单

zyh

9 小时以前 9e2eb64f6f9cf3f0921818e773f52e8e41b1ad88

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

@@ -12,6 +12,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.CanFinMapper;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.OrderDetlPakinServiceImpl;
@@ -65,6 +66,8 @@
    private ManLocDetlMapper manLocDetlMapper;
    @Autowired
    private WrkDetlLogService wrkDetlLogService;
    @Autowired
    private CanFinMapper canFinMapper;

    @Resource
    private StaDescService staDescService;
@@ -277,7 +280,13 @@
    @RequestMapping("/comb/auth")
    @ManagerAuth(memo = "组托")
    public R comb(@RequestBody CombParam combParam){
        mobileService.comb(combParam, getUserId());

        if (combParam.getUserId() != null && !combParam.getUserId().equals(null)){
            mobileService.comb(combParam, combParam.getUserId());
        }else {
            mobileService.comb(combParam, getUserId());
        }

        return R.ok("组托成功");
    }

@@ -625,16 +634,30 @@
                .setAppeTime(date)
                .setModiUser(9945L)
                .setModiTime(date);
        if (!taskService.insert(task)) {
        if (taskService.insert(task)) {
            Date now = new Date();
            CanFin canFin = new CanFin();
            canFin.setAgvType("agv-in");
            canFin.setInNo(TaskNo);
            canFin.setApplyTime(now);
            canFinMapper.insert(canFin);
        }else{
            throw new CoolException("保存工作档失败");
        }

        return r;
        return R.error("下发失败");
    }

    @RequestMapping("/orderIn")
    public synchronized R AGVOrderInReturn() {
        List<OrderPakin> settle = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("settle", 1, 2));
    public synchronized R AGVOrderInReturn(@RequestBody JSONObject param) {
        List<OrderPakin> settle;
        if(param.getString("type").equals("1")){
            settle = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("settle", 1, 2).eq("doc_type",1));
        }else if(param.getString("type").equals("2")){
            settle = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("settle", 1, 2).eq("doc_type",2));
        }
        else {
            settle = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("settle", 1, 2));
        }
        List<String> list = new ArrayList<>();
        for (OrderPakin orderPakin : settle) {
            if (orderPakin.getSettle()==2){