|
|
|
@ -47,6 +47,7 @@ import com.glxp.api.util.*;
|
|
|
|
|
import com.glxp.api.util.udi.FilterUdiUtils;
|
|
|
|
|
import com.glxp.api.util.udi.UdiCalCountUtil;
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
import org.springframework.validation.BindingResult;
|
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
@ -58,72 +59,72 @@ import java.util.stream.Collectors;
|
|
|
|
|
@RestController
|
|
|
|
|
public class IoCodeTempController extends BaseController {
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
private IoCodeTempService codeTempService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
private IoOrderService orderService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
private IBasicBussinessTypeService basicBussinessTypeService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
IoAddInoutService transInoutService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
private SystemParamConfigService systemParamConfigService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
UdiRelevanceService udiRelevanceService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
UdiProductService udiProductService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
BasicCorpService basicUnitMaintainService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
GennerOrderUtils gennerOrderUtils;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
UdiCalCountUtil udiCalCountUtil;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
UdiRlSupService udiRlSupService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
InvWarehouseService invWarehouseService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
IoCheckInoutService ioCheckInoutService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
InvPreinProductDetailService invPreinProductDetailService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
InvProductServiceNew invProductServiceNew;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
IoCodeLostService codeLostService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
IoOrderDetailBizService orderDetailBizService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
IoCodeService codeService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
IoAddInoutService ioAddInoutService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
IoOrderDetailCodeService ioOrderDetailCodeService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
IoCheckInvService checkInvService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
IoSplitFifoCodeService splitFifoCodeService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
IoCollectOriginService collectOriginService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
IoCollectOrderBizOriginService collectOrderBizOriginService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
IoCollectOrderOriginService collectOrderOriginService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
IoCollectOrderService collectOrderService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
IoCollectCodeService ioCollectCodeService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
IoSplitFifoInvService ioSplitFifoInvService;
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
SysWorkplaceQueueService sysWorkplaceQueueService;
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
IoCollectOrderBackupService ioCollectOrderBackupService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
IoCollectSetService collectSetService;
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
SysWorkplaceFreightService sysWorkplaceFreightService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -661,11 +662,11 @@ public class IoCodeTempController extends BaseController {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
IoSplitFifoCodeService fifoCodeService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
IoSplitCodeService splitCodeService;
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
private IoOrderDetailCodeDao orderDetailCodeDao;
|
|
|
|
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@ -1322,7 +1323,7 @@ public class IoCodeTempController extends BaseController {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
RelCodeBatchService relCodeBatchService;
|
|
|
|
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@ -1894,7 +1895,7 @@ public class IoCodeTempController extends BaseController {
|
|
|
|
|
relCodeBatchService.threadUpdateIoCodeTempEntity(code);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
@Autowired
|
|
|
|
|
RelCodeDetailService relCodeDetailService;
|
|
|
|
|
|
|
|
|
|
//前端扫码提交(药品)
|
|
|
|
|