修改备料功能

lbq

2 天以前 c2850e1679353a3978db169d965ef5fce6158677

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java

@@ -4,6 +4,10 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.entity.params.CallForEmptyContainersParam;
import com.vincent.rsf.server.api.entity.params.PdaGeneralParam;
import com.vincent.rsf.server.api.service.InBoundService;
import com.vincent.rsf.server.api.service.PdaOutStockService;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.manager.entity.Loc;
import com.vincent.rsf.server.manager.entity.LocItem;
@@ -38,6 +42,10 @@
    private LocItemService locItemService;
    @Resource
    private AsnOrderService asnOrderService;
    @Resource
    private PdaOutStockService pdaOutStockService;
    @Resource
    private InBoundService inBoundService;


    /**
@@ -53,7 +61,7 @@
        try {
            WkOrder order = new WkOrder();
            String orderNo = params.getString("orderNo");
            order.setCode(orderNo).setPoCode(orderNo).setType(OrderType.ORDER_OUT.type)
            order.setCode(orderNo).setPoCode(orderNo).setType(OrderType.ORDER_Pre.type)
//                    .setWkType(OrderWorkType.ORDER_WORK_TYPE_MATERIAL_PREPARATION.type)
                    .setCreateBy(getLoginUserId())
                    .setUpdateBy(getLoginUserId());
@@ -144,4 +152,17 @@
        }
    }

    @PostMapping("/callForEmptyContainers")
    @ApiOperation("mes呼叫空容器")
    public R callForEmptyContainers(@RequestBody CallForEmptyContainersParam containerWaveParam) {

        return pdaOutStockService.callForEmptyContainers(containerWaveParam, 52L);
    }

    @PostMapping("/in/emptyContainer/warehousing")
    @ApiOperation("空容器入库")
    public R emptyContainerWarehousing(@RequestBody PdaGeneralParam param) {
        return inBoundService.generateTasks(param, 52L);
    }

}