blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
1
1 天以前 a422cb5b73799050827251f835ebc53d5757a96b 
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java


@@ -125,7 +125,7 @@




    @Override


    @Transactional(rollbackFor = Exception.class)


    public synchronized R generateAGVTasks(WaitPakin pakins, String locCode, String orgSta, Long loginUserId) {


    public synchronized R generateAGVTasks(WaitPakin pakins, String locCode, String orgSta,String targSite, Long loginUserId) {


        if (Cools.isEmpty(pakins) || Cools.isEmpty(locCode)) {


            throw new CoolException("参数不能为空！！");


        }


@@ -154,7 +154,7 @@


                    .setTaskType(TaskType.TASK_TYPE_IN.type)


                    .setWarehType(WarehType.WAREHOUSE_TYPE_AGV.val)


                    .setTargLoc(targetLoc)


                    .setTargSite(orgSta)


                    .setTargSite(targSite)


                    .setOrgSite(orgSta)


                    .setBarcode(pakin.getBarcode())


                    .setCreateBy(loginUserId)


@@ -183,6 +183,14 @@


                        .setUpdateBy(loginUserId)


                        .setExtendFields(item.getExtendFields())


                        .setOrderId(item.getAsnId())


                        .setBatch(item.getBatch())


                        .setSplrBatch(item.getBatch())


                        .setPlatWorkCode(item.getPlatWorkCode())


                        .setPlatItemId(item.getPlatItemId())


                        .setOrderId(item.getAsnId())


                        .setSplrBatch(item.getBatch())


                        .setPlatWorkCode(item.getPlatWorkCode())


                        .setPlatItemId(item.getPlatItemId())


                        .setOrderItemId(item.getAsnItemId());


                taskItems.add(taskItem);


            });


@@ -271,6 +279,9 @@


                        .setUpdateBy(loginUserId)


                        .setExtendFields(item.getExtendFields())


                        .setOrderId(item.getAsnId())


                        .setSplrBatch(item.getBatch())


                        .setPlatWorkCode(item.getPlatWorkCode())


                        .setPlatItemId(item.getPlatItemId())


                        .setOrderItemId(item.getAsnItemId());


                taskItems.add(taskItem);


            });


@@ -424,6 +435,9 @@


                        .setUpdateBy(loginUserId)


                        .setExtendFields(item.getExtendFields())


                        .setOrderId(item.getAsnId())


                        .setSplrBatch(item.getBatch())


                        .setPlatWorkCode(item.getPlatWorkCode())


                        .setPlatItemId(item.getPlatItemId())


                        .setOrderItemId(item.getAsnItemId());


                taskItems.add(taskItem);


            });


@@ -688,6 +702,9 @@


                            .setUpdateBy(loginUserId)


                            .setExtendFields(item.getExtendFields())


                            .setOrderId(item.getAsnId())


                            .setSplrBatch(item.getBatch())


                            .setPlatWorkCode(item.getPlatWorkCode())


                            .setPlatItemId(item.getPlatItemId())


                            .setOrderItemId(item.getAsnItemId());


                    taskItems.add(taskItem);


                });