|
|
|
|
@ -1,25 +1,755 @@
|
|
|
|
|
package com.glxp.api.controller.inout;
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
|
|
import com.glxp.api.annotation.AuthRuleAnnotation;
|
|
|
|
|
import com.glxp.api.common.enums.ResultEnum;
|
|
|
|
|
import com.glxp.api.common.res.BaseResponse;
|
|
|
|
|
import com.glxp.api.common.util.ResultVOUtils;
|
|
|
|
|
import com.glxp.api.constant.Constant;
|
|
|
|
|
import com.glxp.api.constant.ConstantStatus;
|
|
|
|
|
import com.glxp.api.controller.BaseController;
|
|
|
|
|
import com.glxp.api.entity.auth.AuthAdmin;
|
|
|
|
|
import com.glxp.api.entity.auth.InvWarehouseEntity;
|
|
|
|
|
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
|
|
|
|
|
import com.glxp.api.entity.basic.BasicCorpEntity;
|
|
|
|
|
import com.glxp.api.entity.basic.UdiEntity;
|
|
|
|
|
import com.glxp.api.entity.basic.UdiProductEntity;
|
|
|
|
|
import com.glxp.api.entity.inout.IoCodeEnttity;
|
|
|
|
|
import com.glxp.api.entity.inout.IoCodeTempEntity;
|
|
|
|
|
import com.glxp.api.entity.inout.IoCodeTempEntity;
|
|
|
|
|
import com.glxp.api.entity.inout.IoOrderEntity;
|
|
|
|
|
import com.glxp.api.entity.system.SystemParamConfigEntity;
|
|
|
|
|
import com.glxp.api.http.SpsDirectClient;
|
|
|
|
|
import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
|
|
|
|
|
import com.glxp.api.req.inout.AddEnterCodeRequest;
|
|
|
|
|
import com.glxp.api.req.inout.AddOrderRequest;
|
|
|
|
|
import com.glxp.api.req.inout.FilterIoCodeRequest;
|
|
|
|
|
import com.glxp.api.req.inout.PostOrderRequest;
|
|
|
|
|
import com.glxp.api.res.PageSimpleResponse;
|
|
|
|
|
import com.glxp.api.res.basic.UdiRelevanceResponse;
|
|
|
|
|
import com.glxp.api.res.basic.UdiRlSupResponse;
|
|
|
|
|
import com.glxp.api.res.inout.AddCodeResult;
|
|
|
|
|
import com.glxp.api.service.auth.InvWarehouseService;
|
|
|
|
|
import com.glxp.api.service.basic.*;
|
|
|
|
|
import com.glxp.api.service.inout.IoCodeService;
|
|
|
|
|
import com.glxp.api.service.inout.IoCodeTempService;
|
|
|
|
|
import com.glxp.api.service.inout.IoOrderService;
|
|
|
|
|
import com.glxp.api.service.inout.IoTransInoutService;
|
|
|
|
|
import com.glxp.api.service.system.SystemParamConfigService;
|
|
|
|
|
import com.glxp.api.util.CustomUtil;
|
|
|
|
|
import com.glxp.api.util.DateUtil;
|
|
|
|
|
import com.glxp.api.util.GennerOrderUtils;
|
|
|
|
|
import com.glxp.api.util.OrderNoTypeBean;
|
|
|
|
|
import com.glxp.api.util.page.TableDataInfo;
|
|
|
|
|
import com.glxp.api.util.udi.FilterUdiUtils;
|
|
|
|
|
import com.glxp.api.util.udi.UdiCalCountUtil;
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
|
|
import org.springframework.validation.BindingResult;
|
|
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.Date;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Locale;
|
|
|
|
|
|
|
|
|
|
@RestController
|
|
|
|
|
public class IoCodeTempController extends BaseController {
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
private IoCodeTempService codeTempService;
|
|
|
|
|
@Resource
|
|
|
|
|
private IoOrderService orderService;
|
|
|
|
|
@Resource
|
|
|
|
|
private IBasicBussinessTypeService basicBussinessTypeService;
|
|
|
|
|
@Resource
|
|
|
|
|
private SpsDirectClient spsDirectClient;
|
|
|
|
|
@Resource
|
|
|
|
|
IoTransInoutService transInoutService;
|
|
|
|
|
@Resource
|
|
|
|
|
private SystemParamConfigService systemParamConfigService;
|
|
|
|
|
@Resource
|
|
|
|
|
UdiRelevanceService udiRelevanceService;
|
|
|
|
|
@Resource
|
|
|
|
|
UdiProductService udiProductService;
|
|
|
|
|
@Resource
|
|
|
|
|
BasicUnitMaintainService basicUnitMaintainService;
|
|
|
|
|
@Resource
|
|
|
|
|
GennerOrderUtils gennerOrderUtils;
|
|
|
|
|
@Resource
|
|
|
|
|
UdiCalCountUtil udiCalCountUtil;
|
|
|
|
|
@Resource
|
|
|
|
|
UdiRlSupService udiRlSupService;
|
|
|
|
|
@Resource
|
|
|
|
|
InvWarehouseService invWarehouseService;
|
|
|
|
|
|
|
|
|
|
//手持端扫码单据上传调用接口
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@PostMapping("warehouse/inout/postOrders")
|
|
|
|
|
public BaseResponse postOrders(@RequestBody PostOrderRequest postOrderRequest, BindingResult bindingResult) {
|
|
|
|
|
|
|
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Long userId = getUserId();
|
|
|
|
|
try {
|
|
|
|
|
PostOrderRequest inPostOrder = new PostOrderRequest();
|
|
|
|
|
List<PostOrderRequest.PostOrder> inPostOrders = new ArrayList<>();
|
|
|
|
|
PostOrderRequest outPostOrder = new PostOrderRequest();
|
|
|
|
|
List<PostOrderRequest.PostOrder> outPostOrders = new ArrayList<>();
|
|
|
|
|
|
|
|
|
|
List<PostOrderRequest.PostOrder> postOrders = postOrderRequest.getPostOrders();
|
|
|
|
|
if (postOrders != null && postOrders.size() > 0) {
|
|
|
|
|
for (PostOrderRequest.PostOrder postOrder : postOrders) {
|
|
|
|
|
BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(postOrder.getCodes().get(0).getAction());
|
|
|
|
|
if (bussinessTypeEntity.isOutToSpms()) {
|
|
|
|
|
outPostOrders.add(postOrder);
|
|
|
|
|
} else {
|
|
|
|
|
inPostOrders.add(postOrder);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BeanUtils.copyProperties(postOrderRequest, inPostOrder);
|
|
|
|
|
BeanUtils.copyProperties(postOrderRequest, outPostOrder);
|
|
|
|
|
inPostOrder.setPostOrders(inPostOrders);
|
|
|
|
|
outPostOrder.setPostOrders(outPostOrders);
|
|
|
|
|
|
|
|
|
|
if (CollUtil.isNotEmpty(outPostOrders)) {
|
|
|
|
|
outPostOrder.setWmsUserId(userId + "");
|
|
|
|
|
return spsDirectClient.uploadPdaOrder(outPostOrder);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (CollUtil.isNotEmpty(inPostOrders)) {
|
|
|
|
|
inPostOrder.setCustomerId(getCustomerId());
|
|
|
|
|
inPostOrder.setUserId(userId);
|
|
|
|
|
transInoutService.creatOrderByPda(inPostOrder);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ResultVOUtils.success("上传成功，等待后台处理");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//前端扫码完整性校验
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@PostMapping("warehouse/inout/enterCode")
|
|
|
|
|
public BaseResponse addEndterCode(@RequestBody AddEnterCodeRequest addEnterCodeRequest) {
|
|
|
|
|
|
|
|
|
|
if (StrUtil.isEmpty(addEnterCodeRequest.getCode())) {
|
|
|
|
|
return ResultVOUtils.error(500, "条码不能为空！");
|
|
|
|
|
}
|
|
|
|
|
String code = "";
|
|
|
|
|
String originCode = addEnterCodeRequest.getOriginCode();
|
|
|
|
|
if (originCode == null)
|
|
|
|
|
originCode = "";
|
|
|
|
|
code = originCode + addEnterCodeRequest.getCode();
|
|
|
|
|
String newCode = addEnterCodeRequest.getCode();
|
|
|
|
|
//重复判断
|
|
|
|
|
if (StrUtil.isNotEmpty(addEnterCodeRequest.getOriginCode())) {
|
|
|
|
|
String tempOriginCode = addEnterCodeRequest.getOriginCode();
|
|
|
|
|
if (tempOriginCode.endsWith("\u001D")) {
|
|
|
|
|
tempOriginCode = tempOriginCode.replace("\u001D", "");
|
|
|
|
|
}
|
|
|
|
|
UdiEntity originUdiEntity = FilterUdiUtils.getUdi(tempOriginCode);
|
|
|
|
|
if (StrUtil.isNotEmpty(newCode)) {
|
|
|
|
|
if (newCode.startsWith("10")) {
|
|
|
|
|
if (StrUtil.isNotEmpty(originUdiEntity.getBatchNo())) {
|
|
|
|
|
BaseResponse baseResponse = ResultVOUtils.error(501, "批次号重复添加");
|
|
|
|
|
baseResponse.setData(originCode);
|
|
|
|
|
return baseResponse;
|
|
|
|
|
} else {
|
|
|
|
|
String msg = checkNewCode(originUdiEntity, newCode);
|
|
|
|
|
if (msg != null) {
|
|
|
|
|
BaseResponse baseResponse = ResultVOUtils.error(501, msg);
|
|
|
|
|
baseResponse.setData(originCode);
|
|
|
|
|
return baseResponse;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else if (newCode.startsWith("17")) {
|
|
|
|
|
if (StrUtil.isNotEmpty(originUdiEntity.getExpireDate())) {
|
|
|
|
|
BaseResponse baseResponse = ResultVOUtils.error(501, "失效日期重复添加");
|
|
|
|
|
baseResponse.setData(originCode);
|
|
|
|
|
return baseResponse;
|
|
|
|
|
} else {
|
|
|
|
|
String msg = checkNewCode(originUdiEntity, newCode);
|
|
|
|
|
if (msg != null) {
|
|
|
|
|
BaseResponse baseResponse = ResultVOUtils.error(501, msg);
|
|
|
|
|
baseResponse.setData(originCode);
|
|
|
|
|
return baseResponse;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else if (newCode.startsWith("11")) {
|
|
|
|
|
if (StrUtil.isNotEmpty(originUdiEntity.getProduceDate())) {
|
|
|
|
|
BaseResponse baseResponse = ResultVOUtils.error(501, "生产日期重复添加");
|
|
|
|
|
baseResponse.setData(originCode);
|
|
|
|
|
return baseResponse;
|
|
|
|
|
} else {
|
|
|
|
|
String msg = checkNewCode(originUdiEntity, newCode);
|
|
|
|
|
if (msg != null) {
|
|
|
|
|
BaseResponse baseResponse = ResultVOUtils.error(501, msg);
|
|
|
|
|
baseResponse.setData(originCode);
|
|
|
|
|
return baseResponse;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else if (newCode.startsWith("21")) {
|
|
|
|
|
if (StrUtil.isNotEmpty(originUdiEntity.getSerialNo())) {
|
|
|
|
|
BaseResponse baseResponse = ResultVOUtils.error(501, "序列号重复添加");
|
|
|
|
|
baseResponse.setData(originCode);
|
|
|
|
|
return baseResponse;
|
|
|
|
|
} else {
|
|
|
|
|
String msg = checkNewCode(originUdiEntity, newCode);
|
|
|
|
|
if (msg != null) {
|
|
|
|
|
BaseResponse baseResponse = ResultVOUtils.error(501, msg);
|
|
|
|
|
baseResponse.setData(originCode);
|
|
|
|
|
return baseResponse;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
BaseResponse baseResponse = ResultVOUtils.error(501, "格式错误");
|
|
|
|
|
baseResponse.setData(originCode);
|
|
|
|
|
return baseResponse;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
|
|
|
|
|
if (udiEntity == null) {
|
|
|
|
|
String sptmtodi = systemParamConfigService.selectValueByParamKey(Constant.SPTM_TO_DI);
|
|
|
|
|
if (sptmtodi.equals("1")) {
|
|
|
|
|
if (code.length() == 13) {
|
|
|
|
|
UdiProductEntity udiProductEntity = udiProductService.findBySptm(code);
|
|
|
|
|
if (udiProductEntity != null) {
|
|
|
|
|
BaseResponse baseResponse = ResultVOUtils.error(508, "UDI码格式错误");
|
|
|
|
|
baseResponse.setData(udiProductEntity);
|
|
|
|
|
return baseResponse;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
BaseResponse baseResponse = ResultVOUtils.error(501, "UDI码格式错误");
|
|
|
|
|
baseResponse.setData(originCode);
|
|
|
|
|
return baseResponse;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (StrUtil.isNotEmpty(udiEntity.getBatchNo())) {
|
|
|
|
|
if (code.endsWith("10" + udiEntity.getBatchNo())) {
|
|
|
|
|
code = code + "\u001D";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
UdiRelevanceResponse checkUdi = udiRelevanceService.selectByNameCode(udiEntity.getUdi());
|
|
|
|
|
if (checkUdi == null) {
|
|
|
|
|
return ResultVOUtils.error(500, "耗材字典不存在此产品！");
|
|
|
|
|
}
|
|
|
|
|
boolean checkSuccess = true;
|
|
|
|
|
String lostMsg = "";
|
|
|
|
|
//校验条码完整性
|
|
|
|
|
if ("是".equals(checkUdi.getScbssfbhph()) && StrUtil.isEmpty(udiEntity.getBatchNo())) {
|
|
|
|
|
checkSuccess = false;
|
|
|
|
|
lostMsg = lostMsg + ",批次号";
|
|
|
|
|
}
|
|
|
|
|
if ("是".equals(checkUdi.getScbssfbhscrq()) && StrUtil.isEmpty(udiEntity.getProduceDate())) {
|
|
|
|
|
checkSuccess = false;
|
|
|
|
|
lostMsg = lostMsg + ",生产日期";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ("是".equals(checkUdi.getScbssfbhsxrq()) && StrUtil.isEmpty(udiEntity.getExpireDate())) {
|
|
|
|
|
checkSuccess = false;
|
|
|
|
|
lostMsg = lostMsg + ",失效日期";
|
|
|
|
|
}
|
|
|
|
|
if (("是".equals(checkUdi.getScbssfbhxlh()) && StrUtil.isEmpty(udiEntity.getSerialNo()))
|
|
|
|
|
) {
|
|
|
|
|
checkSuccess = false;
|
|
|
|
|
lostMsg = lostMsg + ",序列号";
|
|
|
|
|
}
|
|
|
|
|
if (StrUtil.isNotEmpty(udiEntity.getSerialNo()) && udiEntity.getSerialNo().length() > 20) {
|
|
|
|
|
return ResultVOUtils.error(504, "序列号超出20位！");
|
|
|
|
|
}
|
|
|
|
|
if (StrUtil.isNotEmpty(udiEntity.getBatchNo()) && udiEntity.getBatchNo().length() > 20) {
|
|
|
|
|
return ResultVOUtils.error(504, "批次号超出20位！");
|
|
|
|
|
}
|
|
|
|
|
if (StrUtil.isEmpty(udiEntity.getSerialNo()) && StrUtil.isEmpty(udiEntity.getBatchNo())) {
|
|
|
|
|
checkSuccess = false;
|
|
|
|
|
}
|
|
|
|
|
if (checkSuccess) {
|
|
|
|
|
if (code.endsWith("\u001D")) {
|
|
|
|
|
code = code.substring(0, code.length() - "\u001D".length());
|
|
|
|
|
}
|
|
|
|
|
return ResultVOUtils.success(code);
|
|
|
|
|
} else {
|
|
|
|
|
if (newCode.startsWith("21") || (StrUtil.isNotEmpty(udiEntity.getSerialNo()) && newCode.contains("21" + udiEntity.getSerialNo()))) {
|
|
|
|
|
if (StrUtil.isEmpty(lostMsg)) {
|
|
|
|
|
lostMsg = ",";
|
|
|
|
|
}
|
|
|
|
|
BaseResponse baseResponse = ResultVOUtils.error(503, "条码完整性错误,缺少" + lostMsg.substring(1) + "是否继续添加？");
|
|
|
|
|
baseResponse.setData(code);
|
|
|
|
|
return baseResponse;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
BaseResponse baseResponse = ResultVOUtils.error(502, "校验未完成");
|
|
|
|
|
baseResponse.setData(code);
|
|
|
|
|
return baseResponse;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public String checkNewCode(UdiEntity originEnity, String newCode) {
|
|
|
|
|
UdiEntity newEntity = FilterUdiUtils.getUdi(originEnity.getUdi() + newCode);
|
|
|
|
|
if (newEntity == null || originEnity == null) {
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
if (StrUtil.isNotEmpty(originEnity.getBatchNo()) && StrUtil.isNotEmpty(newEntity.getBatchNo())) {
|
|
|
|
|
return "批次号重复添加！";
|
|
|
|
|
}
|
|
|
|
|
if (StrUtil.isNotEmpty(originEnity.getProduceDate()) && StrUtil.isNotEmpty(newEntity.getProduceDate())) {
|
|
|
|
|
return "生产日期重复添加！";
|
|
|
|
|
}
|
|
|
|
|
if (StrUtil.isNotEmpty(originEnity.getExpireDate()) && StrUtil.isNotEmpty(newEntity.getExpireDate())) {
|
|
|
|
|
return "失效日期重复添加！";
|
|
|
|
|
}
|
|
|
|
|
if (StrUtil.isNotEmpty(originEnity.getSerialNo()) && StrUtil.isNotEmpty(newEntity.getSerialNo())) {
|
|
|
|
|
return "序列号重复添加！";
|
|
|
|
|
}
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//前端扫码提交
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@PostMapping("warehouse/inout/addOrderWeb")
|
|
|
|
|
public BaseResponse addOrderWeb(@RequestBody AddOrderRequest addOrderRequest, BindingResult bindingResult) {
|
|
|
|
|
|
|
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
|
|
|
|
}
|
|
|
|
|
AddCodeResult addCodeResult = new AddCodeResult();
|
|
|
|
|
|
|
|
|
|
if (addOrderRequest.getAction() == null) {
|
|
|
|
|
addOrderRequest.setAction(addOrderRequest.getBillType());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderRequest.getAction());
|
|
|
|
|
InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(addOrderRequest.getInvCode());
|
|
|
|
|
String code = addOrderRequest.getCode();
|
|
|
|
|
if (StringUtils.isBlank(code)) return ResultVOUtils.error(ResultEnum.DATA_ERROR);
|
|
|
|
|
UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
|
|
|
|
|
if (udiEntity == null)
|
|
|
|
|
return ResultVOUtils.error(500, "无效条码！");
|
|
|
|
|
|
|
|
|
|
if (StrUtil.isNotEmpty(addOrderRequest.getBatchNo())) {
|
|
|
|
|
udiEntity.setBatchNo(addOrderRequest.getBatchNo());
|
|
|
|
|
}
|
|
|
|
|
if (StrUtil.isNotEmpty(addOrderRequest.getProduceDate())) {
|
|
|
|
|
udiEntity.setProduceDate(addOrderRequest.getProduceDate());
|
|
|
|
|
}
|
|
|
|
|
if (StrUtil.isNotEmpty(addOrderRequest.getExpireDate())) {
|
|
|
|
|
udiEntity.setExpireDate(addOrderRequest.getExpireDate());
|
|
|
|
|
}
|
|
|
|
|
if (StrUtil.isNotEmpty(addOrderRequest.getSerialNo())) {
|
|
|
|
|
udiEntity.setSerialNo(addOrderRequest.getSerialNo());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (StrUtil.isNotEmpty(udiEntity.getSerialNo()) && udiEntity.getSerialNo().length() > 20) {
|
|
|
|
|
return ResultVOUtils.error(500, "无效条码！序列号超出最大范围");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (StrUtil.isNotEmpty(udiEntity.getBatchNo()) && udiEntity.getBatchNo().length() > 20) {
|
|
|
|
|
return ResultVOUtils.error(500, "无效条码！批次号超出最大范围");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//批次号校验
|
|
|
|
|
//判断此产品是否开启允许无批次号
|
|
|
|
|
UdiProductEntity udiInfoEntity = udiProductService.findByNameCode(udiEntity.getUdi());
|
|
|
|
|
if (!udiInfoEntity.getAllowNoBatch()) {
|
|
|
|
|
if (StrUtil.isEmpty(udiEntity.getSerialNo()) && StrUtil.isEmpty(udiEntity.getBatchNo())) {
|
|
|
|
|
return ResultVOUtils.error(500, "序列号与批次号不能同时为空！");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
String orderId = addOrderRequest.getOrderId();
|
|
|
|
|
|
|
|
|
|
//三期校验
|
|
|
|
|
if (addOrderRequest.isCodeFillCheck()) {
|
|
|
|
|
|
|
|
|
|
BaseResponse checkOriginCodeRes = checkOriginCode(udiEntity);
|
|
|
|
|
if (checkOriginCodeRes != null) {
|
|
|
|
|
if (StrUtil.isNotEmpty(orderId)) {
|
|
|
|
|
List<IoCodeTempEntity> ioCodeEnttities = codeTempService.findByOrderId(orderId);
|
|
|
|
|
IoCodeTempEntity ioCodeEnttity = isExitLocal(code, ioCodeEnttities);
|
|
|
|
|
if (ioCodeEnttity == null) {
|
|
|
|
|
return checkOriginCodeRes;
|
|
|
|
|
}
|
|
|
|
|
} else
|
|
|
|
|
return checkOriginCodeRes;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//过期提醒：
|
|
|
|
|
SystemParamConfigEntity expireParamConfigEntity = systemParamConfigService.selectByParamKey("expire_date_tip");
|
|
|
|
|
if (expireParamConfigEntity.getParamValue().equals("1") && !addOrderRequest.isIgnoreExpire()) {
|
|
|
|
|
if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
|
|
|
|
|
String expireDate = "20" + udiEntity.getExpireDate();
|
|
|
|
|
long expireTime = DateUtil.parseDateExpire(expireDate);
|
|
|
|
|
if (expireTime - System.currentTimeMillis() < 0) {
|
|
|
|
|
return ResultVOUtils.error(504, "当前产品已过期,是否确定继续添加?");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//失效期提醒
|
|
|
|
|
SystemParamConfigEntity recentParamConfigEntity = systemParamConfigService.selectByParamKey("recent_date_tip");
|
|
|
|
|
long recent = Long.parseLong(recentParamConfigEntity.getParamValue());
|
|
|
|
|
if (recent > 0 && !addOrderRequest.isIgnoreRecentExpire()) {
|
|
|
|
|
if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
|
|
|
|
|
String expireDate = "20" + udiEntity.getExpireDate();
|
|
|
|
|
long expireTime = DateUtil.parseDateExpire(expireDate);
|
|
|
|
|
long recentTieme = Math.abs(recent * 24 * 60 * 60 * 1000);
|
|
|
|
|
long resultTime = expireTime - System.currentTimeMillis();
|
|
|
|
|
|
|
|
|
|
if (resultTime > 0) {
|
|
|
|
|
long time = resultTime / (24 * 60 * 60 * 1000);
|
|
|
|
|
if (resultTime < recentTieme) {
|
|
|
|
|
return ResultVOUtils.error(505, "当前产品临近过期，距过期还剩" + time + "天,是否确定继续添加?");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//校验预验收是否已存在 todo
|
|
|
|
|
if (bussinessTypeEntity.isPreIn()) {
|
|
|
|
|
if (StrUtil.isNotEmpty(udiEntity.getSerialNo())) {
|
|
|
|
|
// List<InvProductDetailEntity> invProductDetailEntities = invPreInProductDetailService.findByOriginCode(code);
|
|
|
|
|
// if (CollUtil.isNotEmpty(invProductDetailEntities)) {
|
|
|
|
|
// return ResultVOUtils.error(500, "条码已存在！");
|
|
|
|
|
// }
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//校验预验收库存是否已存在
|
|
|
|
|
if (addOrderRequest.isPreCheck()) {
|
|
|
|
|
// InvProductDetailEntity invProductDetailEntity = invPreInProductDetailService.statInvPreInDetail(code);
|
|
|
|
|
// if (invProductDetailEntity == null) {
|
|
|
|
|
// return ResultVOUtils.error(500, "预验收库存未存在此产品！");
|
|
|
|
|
// } else {
|
|
|
|
|
//
|
|
|
|
|
//
|
|
|
|
|
// if (StrUtil.isNotEmpty(invProductDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(addOrderRequest.getBatchNo())
|
|
|
|
|
// && !invProductDetailEntity.getBatchNo().equals(addOrderRequest.getBatchNo())) {
|
|
|
|
|
// return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！");
|
|
|
|
|
//
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
//
|
|
|
|
|
// if (StrUtil.isNotEmpty(orderId)) {//非首次添加
|
|
|
|
|
// if (StrUtil.isEmpty(udiEntity.getSerialNo())) {//该单据已有该产品
|
|
|
|
|
// WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest();
|
|
|
|
|
// warehouseQueryRequest.setOrderId(orderId);
|
|
|
|
|
// warehouseQueryRequest.setCode(code);
|
|
|
|
|
// List<WarehouseEntity> codeEnttitys = codesTempService.findByOrderIdAndCode(warehouseQueryRequest);
|
|
|
|
|
// if (CollUtil.isNotEmpty(codeEnttitys)) {
|
|
|
|
|
// WarehouseEntity codeEnttity = codeEnttitys.get(0);
|
|
|
|
|
// if (invProductDetailEntity.getCount() < (codeEnttity.getCount() + 1)) {
|
|
|
|
|
// return ResultVOUtils.error(500, "超出预验收库存数量");
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// } else {
|
|
|
|
|
// if (invProductDetailEntity.getCount() < 1) {
|
|
|
|
|
// return ResultVOUtils.error(500, "超出预验收库存数量");
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
} else //校验库存是否存在
|
|
|
|
|
if (addOrderRequest.isVailInv()) {
|
|
|
|
|
// if (bussinessTypeEntity.isAdvanceType()) {
|
|
|
|
|
// int count = invPreProductDetailService.vailStockCount(code);
|
|
|
|
|
// if (count < 0) {
|
|
|
|
|
// return ResultVOUtils.error(500, "当前库存不足，不允许0库存出库");
|
|
|
|
|
// }
|
|
|
|
|
// } else {
|
|
|
|
|
// int count = invProductDetailService.vailStockCount(code, addOrderRequest.getLocStorageCode(), addOrderRequest.getInvWarehouseCode(), null);
|
|
|
|
|
// if (count <= 0) {
|
|
|
|
|
// return ResultVOUtils.error(500, "当前库存不足，不允许0库存出库");
|
|
|
|
|
// } else if (StrUtil.isNotBlank(addOrderRequest.getOrderId())) {
|
|
|
|
|
// //查询此单据已扫描的条码数量
|
|
|
|
|
// WarehouseEntity warehouse = codesTempService.findByUnique(addOrderRequest.getOrderId(), addOrderRequest.getCode());
|
|
|
|
|
// if (null != warehouse && warehouse.getCount() >= count) {
|
|
|
|
|
// return ResultVOUtils.error(500, "当前库存不足，不允许0库存出库");
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (addOrderRequest.getFromCorp() == null) {
|
|
|
|
|
BasicCorpEntity basicCorpEntity = basicUnitMaintainService.selectByName(addOrderRequest.getFromCorp());
|
|
|
|
|
if (basicCorpEntity == null && bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT && bussinessTypeEntity.isGenUnit()) {
|
|
|
|
|
basicCorpEntity = new BasicCorpEntity();
|
|
|
|
|
basicCorpEntity.setErpId(CustomUtil.getUnitId());
|
|
|
|
|
addOrderRequest.setFromCorp((basicCorpEntity.getErpId()));
|
|
|
|
|
basicCorpEntity.setCorpType(ConstantStatus.CORP_SICK);
|
|
|
|
|
basicCorpEntity.setOutType(ConstantStatus.CORP_SICK_SICK);
|
|
|
|
|
basicCorpEntity.setName(addOrderRequest.getFromCorp());
|
|
|
|
|
addOrderRequest.setFromCorp(basicCorpEntity.getName());
|
|
|
|
|
basicUnitMaintainService.insertBasicUnitMaintain(basicCorpEntity);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//先生成扫码单据
|
|
|
|
|
IoOrderEntity orderEntity = orderService.findByBillNo(orderId);
|
|
|
|
|
if (StringUtils.isBlank(orderId) || orderEntity == null) {
|
|
|
|
|
String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(bussinessTypeEntity.getPrefix()), "yyyyMMdd"));
|
|
|
|
|
orderId = orderNo;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
List<IoCodeTempEntity> codeEnttitys = codeTempService.findByOrderId(orderId);
|
|
|
|
|
IoCodeTempEntity codeEnttity = new IoCodeTempEntity();
|
|
|
|
|
IoCodeTempEntity exitLocalEntity = null;
|
|
|
|
|
if (codeEnttitys.size() > 0) {
|
|
|
|
|
exitLocalEntity = isExitLocal(code, codeEnttitys);
|
|
|
|
|
if (exitLocalEntity != null) {
|
|
|
|
|
codeEnttity = exitLocalEntity;
|
|
|
|
|
codeEnttity.setCount(codeEnttity.getCount() + 1);
|
|
|
|
|
if (StringUtils.isBlank(codeEnttity.getSerialNo())) {
|
|
|
|
|
codeTempService.updateById(codeEnttity);
|
|
|
|
|
} else {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.DATA_REPEAT);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (exitLocalEntity == null) {
|
|
|
|
|
codeEnttity.setCode(code);
|
|
|
|
|
codeEnttity.setOrderId(orderId);
|
|
|
|
|
codeEnttity.setCorpOrderId(addOrderRequest.getCorpOrderId());
|
|
|
|
|
codeEnttity.setCreateTime(new Date());
|
|
|
|
|
codeEnttity.setUpdateTime(new Date());
|
|
|
|
|
codeEnttity.setMainAction(bussinessTypeEntity.getMainAction());
|
|
|
|
|
codeEnttity.setAction(bussinessTypeEntity.getAction());
|
|
|
|
|
codeEnttity.setNameCode(udiEntity.getUdi());
|
|
|
|
|
codeEnttity.setBatchNo(udiEntity.getBatchNo());
|
|
|
|
|
codeEnttity.setProduceDate(udiEntity.getProduceDate());
|
|
|
|
|
codeEnttity.setExpireDate(udiEntity.getExpireDate());
|
|
|
|
|
codeEnttity.setSerialNo(udiEntity.getSerialNo());
|
|
|
|
|
codeEnttity.setDeptCode(invWarehouseEntity.getParentId());
|
|
|
|
|
codeEnttity.setInvCode(addOrderRequest.getInvCode());
|
|
|
|
|
codeEnttity.setCount(1);
|
|
|
|
|
String unitFk = null;
|
|
|
|
|
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
|
|
|
|
|
unitFk = addOrderRequest.getFromCorp();
|
|
|
|
|
}
|
|
|
|
|
//产品是否可以以使用单元入库
|
|
|
|
|
List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.selectAllByNameCode(codeEnttity.getNameCode(), unitFk);
|
|
|
|
|
if (udiRelevanceResponses.size() == 1) {
|
|
|
|
|
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0);
|
|
|
|
|
if (udiRelevanceResponse == null) {
|
|
|
|
|
return ResultVOUtils.error(500, "该产品信息未维护！");
|
|
|
|
|
} else if (!udiRelevanceResponse.getIsUseDy() && udiRelevanceResponse.getDiType() == ConstantStatus.DITYPE_SYDY) {
|
|
|
|
|
return ResultVOUtils.error(500, "该产品不允许以使用单元入库！");
|
|
|
|
|
}
|
|
|
|
|
//计算实际数量
|
|
|
|
|
codeEnttity.setReCount(codeEnttity.getCount() * udiCalCountUtil.getActCount(udiRelevanceResponse));
|
|
|
|
|
} else if (udiRelevanceResponses.size() == 0) {
|
|
|
|
|
if (unitFk == null)
|
|
|
|
|
return ResultVOUtils.error(500, "耗材字典不存在此产品！");
|
|
|
|
|
else
|
|
|
|
|
return ResultVOUtils.error(500, "当前供应商不存在此配送产品！");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//校验供应商是否配送此产品
|
|
|
|
|
BaseResponse corpResponse = checkCorp(codeEnttity, bussinessTypeEntity, unitFk);
|
|
|
|
|
if (corpResponse != null) {
|
|
|
|
|
return corpResponse;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
IoOrderEntity isExit = orderService.findById(orderId);
|
|
|
|
|
if (isExit == null) {
|
|
|
|
|
IoOrderEntity orderSaveRequest = new IoOrderEntity();
|
|
|
|
|
orderSaveRequest.setBillNo(orderId);
|
|
|
|
|
orderSaveRequest.setCorpOrderId(addOrderRequest.getCorpOrderId());
|
|
|
|
|
orderSaveRequest.setMainAction(bussinessTypeEntity.getMainAction());
|
|
|
|
|
orderSaveRequest.setAction(bussinessTypeEntity.getAction());
|
|
|
|
|
orderSaveRequest.setFromCorp(addOrderRequest.getFromCorp());
|
|
|
|
|
orderSaveRequest.setFromInvCode(addOrderRequest.getFromInvCode());
|
|
|
|
|
orderSaveRequest.setFromType(ConstantStatus.FROM_WEBNEW);
|
|
|
|
|
orderSaveRequest.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);
|
|
|
|
|
orderSaveRequest.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT);
|
|
|
|
|
AuthAdmin authAdmin = getUser();
|
|
|
|
|
orderSaveRequest.setCreateUser(authAdmin.getId() + "");
|
|
|
|
|
orderSaveRequest.setCreateTime(new Date());
|
|
|
|
|
orderSaveRequest.setUpdateUser(authAdmin.getId() + "");
|
|
|
|
|
orderSaveRequest.setUpdateTime(new Date());
|
|
|
|
|
orderSaveRequest.setCustomerId(authAdmin.getCustomerId());
|
|
|
|
|
orderSaveRequest.setDeptCode(invWarehouseEntity.getParentId());
|
|
|
|
|
orderSaveRequest.setInvCode(addOrderRequest.getInvCode());
|
|
|
|
|
orderService.insertOrder(orderSaveRequest);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BaseResponse baseResponse = checkRelId(codeEnttity, unitFk);
|
|
|
|
|
codeEnttity = codeTempService.findByUnique(codeEnttity.getOrderId(), codeEnttity.getCode());
|
|
|
|
|
if (baseResponse == null) {
|
|
|
|
|
baseResponse = checkSupId(bussinessTypeEntity, codeEnttity, unitFk);
|
|
|
|
|
if (baseResponse != null)
|
|
|
|
|
return baseResponse;
|
|
|
|
|
} else {
|
|
|
|
|
if (baseResponse.getCode() == 501) {
|
|
|
|
|
return baseResponse;
|
|
|
|
|
} else if (baseResponse.getCode() == 502) {
|
|
|
|
|
return baseResponse;
|
|
|
|
|
}
|
|
|
|
|
checkSupId(bussinessTypeEntity, codeEnttity, unitFk);
|
|
|
|
|
return baseResponse;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
addCodeResult.setOrderId(orderId);
|
|
|
|
|
return ResultVOUtils.success(addCodeResult);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//校验条码完整性
|
|
|
|
|
public BaseResponse checkOriginCode(UdiEntity udiEntity) {
|
|
|
|
|
//校验条码的完整性
|
|
|
|
|
String errMsg = "";
|
|
|
|
|
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(udiEntity.getUdi());
|
|
|
|
|
if (udiRelevanceResponse == null) {
|
|
|
|
|
return ResultVOUtils.error(501, "耗材字典不存在此产品！");
|
|
|
|
|
}
|
|
|
|
|
if (StrUtil.isEmpty(udiEntity.getBatchNo()) && !udiRelevanceResponse.getAllowNoBatch()) {
|
|
|
|
|
errMsg = errMsg + ",批次号";
|
|
|
|
|
}
|
|
|
|
|
if (StrUtil.isEmpty(udiEntity.getProduceDate()) && !udiRelevanceResponse.getAllowNoProduct()) {
|
|
|
|
|
errMsg = errMsg + ",生产日期";
|
|
|
|
|
}
|
|
|
|
|
if (StrUtil.isEmpty(udiEntity.getExpireDate()) && !udiRelevanceResponse.getAllowNoExpire()) {
|
|
|
|
|
errMsg = errMsg + ",失效日期";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (StrUtil.isNotEmpty(errMsg)) {
|
|
|
|
|
BaseResponse baseResponse = ResultVOUtils.error(507, "产品三期缺失请补齐" + errMsg.substring(1) + "");
|
|
|
|
|
baseResponse.setData(udiEntity);
|
|
|
|
|
return baseResponse;
|
|
|
|
|
}
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//校验供应商是否配送此产品
|
|
|
|
|
public BaseResponse checkCorp(IoCodeTempEntity codeEnttity, BasicBussinessTypeEntity bussinessTypeEntity, String unitFk) {
|
|
|
|
|
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
|
|
|
|
|
CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
|
|
|
|
|
companyProductRelevanceRequest.setUnitFk(unitFk);
|
|
|
|
|
UdiEntity udiEntity = FilterUdiUtils.getUdi(codeEnttity.getCode());
|
|
|
|
|
companyProductRelevanceRequest.setNameCode(udiEntity.getUdi());
|
|
|
|
|
List<UdiRlSupResponse> datas = udiRlSupService.filterUdiGp(companyProductRelevanceRequest);
|
|
|
|
|
if (datas.size() <= 0) {
|
|
|
|
|
return ResultVOUtils.error(500, "当前供应商不存在此配送产品！");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//校验产品ID唯一性
|
|
|
|
|
public BaseResponse checkRelId(IoCodeTempEntity codeEnttity, String unitFk) {
|
|
|
|
|
|
|
|
|
|
List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.selectAllByNameCode(codeEnttity.getNameCode(), unitFk);
|
|
|
|
|
if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && codeEnttity.getRelId() == null) {//同一个DI绑定多个产品西信息
|
|
|
|
|
codeEnttity.setRelId(null);
|
|
|
|
|
codeEnttity.setStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
|
|
|
|
|
codeTempService.insert(codeEnttity);
|
|
|
|
|
codeEnttity = codeTempService.findByUnique(codeEnttity.getOrderId(), codeEnttity.getCode());
|
|
|
|
|
BaseResponse baseResponse = ResultVOUtils.error(502, "DI绑定多个产品ID,请指定对应产品");
|
|
|
|
|
baseResponse.setData(codeEnttity);
|
|
|
|
|
return baseResponse;
|
|
|
|
|
} else if (udiRelevanceEntities == null || udiRelevanceEntities.size() == 0) {//未找到产品信息，一般不会出现
|
|
|
|
|
codeEnttity.setRelId(null);
|
|
|
|
|
codeEnttity.setStatus(2);
|
|
|
|
|
return ResultVOUtils.error(501, "耗材字典不存在此产品！");
|
|
|
|
|
} else {
|
|
|
|
|
codeEnttity.setStatus(0);
|
|
|
|
|
if (codeEnttity.getRelId() == null)
|
|
|
|
|
codeEnttity.setRelId(udiRelevanceEntities.get(0).getId());
|
|
|
|
|
codeTempService.insert(codeEnttity);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//校验供应商唯一性
|
|
|
|
|
public BaseResponse checkSupId(BasicBussinessTypeEntity bussinessTypeEntity, IoCodeTempEntity codeEnttity, String unitFk) {
|
|
|
|
|
String originSupId = null;
|
|
|
|
|
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
|
|
|
|
|
if (unitFk != null)
|
|
|
|
|
originSupId = unitFk;
|
|
|
|
|
}
|
|
|
|
|
if (originSupId != null) {
|
|
|
|
|
codeEnttity.setSupId(originSupId);
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
|
|
IoCodeEnttity ioCodeEnttity = new IoCodeEnttity();
|
|
|
|
|
BeanUtils.copyProperties(codeEnttity, ioCodeEnttity);
|
|
|
|
|
String supId = transInoutService.checkInvExitSup(ioCodeEnttity);
|
|
|
|
|
if (supId == null) {
|
|
|
|
|
supId = transInoutService.checkExitSup(codeEnttity.getRelId());
|
|
|
|
|
}
|
|
|
|
|
if (supId == null) {
|
|
|
|
|
codeEnttity.setSupId(null);
|
|
|
|
|
BaseResponse baseResponse = ResultVOUtils.error(503, "该产品未绑定供应商,请指定对应的供应商");
|
|
|
|
|
baseResponse.setData(codeEnttity);
|
|
|
|
|
return baseResponse;
|
|
|
|
|
} else if ("MUTI".equals(supId)) {
|
|
|
|
|
codeEnttity.setSupId(null);
|
|
|
|
|
BaseResponse baseResponse = ResultVOUtils.error(503, "该产品绑定多个供应商,请指定对应的供应商");
|
|
|
|
|
baseResponse.setData(codeEnttity);
|
|
|
|
|
return baseResponse;
|
|
|
|
|
} else {
|
|
|
|
|
codeEnttity.setSupId(supId);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
codeTempService.updateById(codeEnttity);
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//判断本单是否存在
|
|
|
|
|
public IoCodeTempEntity isExitLocal(String code, List<IoCodeTempEntity> codeEnttityList) {
|
|
|
|
|
|
|
|
|
|
UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
|
|
|
|
|
for (int i = 0; i < codeEnttityList.size(); i++) {
|
|
|
|
|
IoCodeTempEntity drugCodeSelectEntity = codeEnttityList.get(i);
|
|
|
|
|
if (codeEnttityList.get(i).getCode().equals(code)) {
|
|
|
|
|
return drugCodeSelectEntity;
|
|
|
|
|
}
|
|
|
|
|
// UdiEntity originUdiEntity = FilterUdiUtils.getUdi(drugCodeSelectEntity.getCode());
|
|
|
|
|
if (!StrUtil.emptyIfNull(drugCodeSelectEntity.getNameCode()).equals(StrUtil.emptyIfNull(udiEntity.getUdi()))) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (!StrUtil.emptyIfNull(drugCodeSelectEntity.getBatchNo()).toUpperCase(Locale.ROOT).equals(StrUtil.emptyIfNull(udiEntity.getBatchNo()).toUpperCase(Locale.ROOT))) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (!StrUtil.emptyIfNull(drugCodeSelectEntity.getProduceDate()).equals(StrUtil.emptyIfNull(udiEntity.getProduceDate()))) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (!StrUtil.emptyIfNull(drugCodeSelectEntity.getExpireDate()).equals(StrUtil.emptyIfNull(udiEntity.getExpireDate()))) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (!StrUtil.emptyIfNull(drugCodeSelectEntity.getSerialNo()).equals(StrUtil.emptyIfNull(udiEntity.getSerialNo()))) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
return drugCodeSelectEntity;
|
|
|
|
|
}
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@ -35,4 +765,5 @@ public class IoCodeTempController extends BaseController {
|
|
|
|
|
return ResultVOUtils.success(pageSimpleResponse);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
郑明梁
2 years ago