更新审核人,核对人,供应商编辑信息bug

dev
anthonywj 2 years ago
parent 86f084836e
commit 950301315d

@ -375,7 +375,7 @@ public class IoCodeTempController extends BaseController {
if (udiInfoEntity == null) { if (udiInfoEntity == null) {
return ResultVOUtils.error(500, "耗材字典不存在此产品!"); return ResultVOUtils.error(500, "耗材字典不存在此产品!");
} }
if (!udiInfoEntity.getAllowNoBatch()) { if (!IntUtil.value(udiInfoEntity.getAllowNoBatch())) {
if (StrUtil.isEmpty(udiEntity.getSerialNo()) && StrUtil.isEmpty(udiEntity.getBatchNo())) { if (StrUtil.isEmpty(udiEntity.getSerialNo()) && StrUtil.isEmpty(udiEntity.getBatchNo())) {
return ResultVOUtils.error(500, "序列号与批次号不能同时为空!"); return ResultVOUtils.error(500, "序列号与批次号不能同时为空!");
} }

@ -359,7 +359,7 @@ public class IoOrderController extends BaseController {
public BaseResponse checkSubmitEnable(IoOrderEntity orderEntity) { public BaseResponse checkSubmitEnable(IoOrderEntity orderEntity) {
if(orderEntity==null){ if (orderEntity == null) {
return ResultVOUtils.error(500, "提交失败,请先添加物资!"); return ResultVOUtils.error(500, "提交失败,请先添加物资!");
} }
@ -735,7 +735,7 @@ public class IoOrderController extends BaseController {
@PostMapping("/udiwms/stock/order/change") @PostMapping("/udiwms/stock/order/change")
public BaseResponse stockOrderChange(@RequestBody AddOrderChangeRequest addOrderChangeRequest) { public BaseResponse stockOrderChange(@RequestBody AddOrderChangeRequest addOrderChangeRequest) {
AuthAdmin authAdmin = getUser();
IoOrderEntity originOrder = orderService.findByBillNo(addOrderChangeRequest.getOrderId()); IoOrderEntity originOrder = orderService.findByBillNo(addOrderChangeRequest.getOrderId());
IoOrderEntity newOrder = new IoOrderEntity(); IoOrderEntity newOrder = new IoOrderEntity();
List<IoCodeEntity> originCodes = codeService.findByOrderId(originOrder.getBillNo()); List<IoCodeEntity> originCodes = codeService.findByOrderId(originOrder.getBillNo());
@ -748,7 +748,8 @@ public class IoOrderController extends BaseController {
newOrder.setFromDeptCode(fromInv.getParentId()); newOrder.setFromDeptCode(fromInv.getParentId());
} }
newOrder.setCreateUser(authAdmin.getId() + "");
newOrder.setUpdateUser(authAdmin.getId() + "");
InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(addOrderChangeRequest.getInvCode()); InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(addOrderChangeRequest.getInvCode());
newOrder.setInvCode(addOrderChangeRequest.getInvCode()); newOrder.setInvCode(addOrderChangeRequest.getInvCode());
newOrder.setDeptCode(invWarehouseEntity.getParentId()); newOrder.setDeptCode(invWarehouseEntity.getParentId());
@ -829,8 +830,8 @@ public class IoOrderController extends BaseController {
return ResultVOUtils.success(); return ResultVOUtils.success();
} }
@GetMapping ("/udiwms/inout/order/getUserBean") @GetMapping("/udiwms/inout/order/getUserBean")
public BaseResponse getUserBean(){ public BaseResponse getUserBean() {
AuthAdmin userBean = customerService.getUserBean(); AuthAdmin userBean = customerService.getUserBean();
@ -838,5 +839,4 @@ public class IoOrderController extends BaseController {
} }
} }

@ -96,30 +96,4 @@ public class UdiProductEntity {
private String categoryName; private String categoryName;
private Date updateTime; private Date updateTime;
public Boolean getAllowNoBatch() {
if (allowNoBatch == null)
return false;
return allowNoBatch;
}
public Boolean getAllowNoExpire() {
if (allowNoExpire == null)
return false;
return allowNoExpire;
}
public Boolean getAllowNoProduct() {
if (allowNoProduct == null)
return false;
return allowNoProduct;
}
public Boolean getAllowNoSerial() {
if (allowNoSerial == null)
return false;
return allowNoSerial;
}
} }

@ -329,7 +329,6 @@ public class IoCheckInoutService {
codeService.insert(codeEnttity); codeService.insert(codeEnttity);
} }
codeTempService.deleteByBillNo(orderEntity.getBillNo()); codeTempService.deleteByBillNo(orderEntity.getBillNo());
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_SUCCESS); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_SUCCESS);
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST); orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
orderEntity.setUpdateTime(new Date()); orderEntity.setUpdateTime(new Date());
@ -748,7 +747,9 @@ public class IoCheckInoutService {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
} }
} }
if (StrUtil.isEmpty(orderEntity.getCheckUser())) {
orderEntity.setCheckUser(orderEntity.getCreateUser());
}
if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) { if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) {
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_REW); orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_REW);
orderEntity.setUpdateTime(new Date()); orderEntity.setUpdateTime(new Date());
@ -810,6 +811,9 @@ public class IoCheckInoutService {
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_CHECK); orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_CHECK);
orderEntity.setUpdateTime(new Date()); orderEntity.setUpdateTime(new Date());
orderEntity.setAuditTime(new Date()); orderEntity.setAuditTime(new Date());
if (StrUtil.isEmpty(orderEntity.getReviewUser())) {
orderEntity.setReviewUser(orderEntity.getReviewUser());
}
orderService.update(orderEntity); orderService.update(orderEntity);
genInv(orderEntity, bussinessTypeEntity); genInv(orderEntity, bussinessTypeEntity);
} }

Loading…
Cancel
Save