rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java

@@ -17,6 +17,7 @@
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.entity.DictData;
import com.vincent.rsf.server.system.entity.FieldsItem;
import com.vincent.rsf.server.system.entity.User;
@@ -26,6 +27,7 @@
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.service.impl.FieldsItemServiceImpl;
import com.vincent.rsf.server.system.service.impl.UserServiceImpl;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -391,15 +393,35 @@
        if (!task.getTaskStatus().equals(TaskStsType.WAVE_SEED.id)) {
            return R.error("任务状态不是等待确认");
        }
        //任务号不能重复，生成新任务号下发至RCS
        String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);

        task.setTaskStatus(TaskStsType.GENERATE_IN.id)
                .setTaskCode(ruleCode)
                .setTargLoc(task.getOrgLoc())
                .setOrgSite(task.getTargSite())
                .setTaskType(TaskType.TASK_TYPE_CHECK_IN.type)
                .setUpdateTime(new Date());

        if (!taskService.updateById(task)) {
            throw new CoolException("任务状态修改失败！！");
        }

        List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
        if (Objects.isNull(taskItems) || taskItems.isEmpty()) {
            throw new CoolException("数据错误，任务明细不存在！！");
        }

        List<TaskItem> items = JSONArray.parseArray(JSONArray.toJSONString(map.get("items")), TaskItem.class);
        items.forEach(taskItem -> {
            taskItems.forEach(item -> {
                if (taskItem.getFieldsIndex().equals(item.getFieldsIndex())) {
                    item.setAnfme(taskItem.getCheckQty());
                    if (!taskItemService.updateById(item)) {
                        throw new CoolException("盘点明细修改失败！！");
                    }
                }
            });
        });

        uploadCheckResult(task);

@@ -425,7 +447,6 @@
        List<ReportDataParam> reportDataParams = new ArrayList<>();
        taskItems.forEach(taskItem -> {
            ReportDataParam dataParam = new ReportDataParam();

            User user = userService.getById(taskItem.getUpdateBy());
            String nickName = null;
            if (!Objects.isNull(user)) {

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java

@@ -249,6 +249,7 @@
        params.setAction("Update").setOrderType("PD_stock");

        HttpEntity httpEntity = new HttpEntity(params, headers);

        ResponseEntity<String> exchange = restTemplate.exchange(rcsUrl, HttpMethod.POST, httpEntity, String.class);
        log.info("盘点库存修改，返回结果： {}", exchange);
        if (Objects.isNull(exchange.getBody())) {

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java

@@ -117,6 +117,10 @@
    @ApiModelProperty("库存数量")
    private Double workQty;

    @ApiModelProperty("盘点数量")
    @TableField(exist = false)
    private Double checkQty = 0.0;

    /**
     * 完成数量
     */

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java

@@ -47,7 +47,7 @@
     * @description: 自动获取已生成盘点任务的盘点列表
     * @version 1.0
     */
    @Scheduled(cron = "0/15 * * * * ?")
//    @Scheduled(cron = "0/15 * * * * ?")
    @Transactional(rollbackFor = Exception.class)
    public void genReCheck() {
        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java

@@ -268,6 +268,7 @@
                        sb.append(params.get(field.getFields()));
                    }
                    sb.append(wkOrderItem.getMatnrId() + wkOrderItem.getSplrBatch());
                    log.error("=======================>添加批号字符串" + sb.toString());
                    //获取16位uuid
                    String uuid16 = Cools.md5Chinese(sb.toString());
                    wkOrderItem.setFieldsIndex(uuid16);

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java

@@ -744,7 +744,10 @@
            }
            BeanUtils.copyProperties(locWorking, locItem);
            locItem.setWorkQty(0.0).setQty(0.0).setLocCode(loc.getCode()).setLocId(loc.getId()).setId(null).setUpdateBy(loginUserId).setUpdateTime(new Date());
            items.add(locItem);
            //数量为零的不入库
            if (locItem.getAnfme().compareTo(0.0) > 0) {
                items.add(locItem);
            }
        }

        if (!locItemService.saveBatch(items)) {
@@ -1492,7 +1495,6 @@
                CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
                if (result.getCode() == 200) {
                    tasks.forEach(task -> {

                        if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)
                                || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)
                                || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)