diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index b983e0e80..54a4eca32 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -328,11 +328,6 @@ public class IoCodeTempController extends BaseController { 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(); @@ -573,7 +568,7 @@ public class IoCodeTempController extends BaseController { } - IoOrderEntity isExit = orderService.findById(orderId); + IoOrderEntity isExit = orderService.findByBillNo(orderId); if (isExit == null) { orderEntity = new IoOrderEntity(); orderEntity.setBillNo(orderId); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 35211fe53..387d0bb80 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -5,17 +5,25 @@ 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.entity.basic.BasicBussinessTypeEntity; +import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.inout.IoOrderEntity; +import com.glxp.api.req.inout.AddOrderRequest; import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.inout.IoOrderResponse; +import com.glxp.api.service.basic.IBasicBussinessTypeService; +import com.glxp.api.service.inout.IoCodeTempService; import com.glxp.api.service.inout.IoOrderService; import lombok.extern.slf4j.Slf4j; 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.Date; import java.util.List; @@ -25,6 +33,10 @@ public class IoOrderController { @Resource private IoOrderService orderService; + @Resource + private IBasicBussinessTypeService basicBussinessTypeService; + @Resource + private IoCodeTempService codeTempService; /** * 查询单据列表 @@ -53,5 +65,29 @@ public class IoOrderController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") + @PostMapping("warehouse/inout/saveOrderWeb") + public BaseResponse saveOrderWeb(@RequestBody AddOrderRequest addOrderRequest) { + IoOrderEntity orderEntity = new IoOrderEntity(); + orderEntity.setAction(addOrderRequest.getAction()); + BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderRequest.getAction()); + orderEntity.setMainAction(bussinessTypeEntity.getMainAction()); + orderEntity.setFromCorp(addOrderRequest.getFromCorp()); + orderEntity.setFromInvCode(addOrderRequest.getFromInvCode()); + orderEntity.setDeptCode(addOrderRequest.getDeptCode()); + orderEntity.setInvCode(addOrderRequest.getInvCode()); + orderService.updateByBillNo(orderEntity); + + + IoCodeTempEntity warehouseEntity = new IoCodeTempEntity(); + warehouseEntity.setOrderId(orderEntity.getBillNo()); + warehouseEntity.setAction(orderEntity.getAction()); + warehouseEntity.setMainAction(orderEntity.getMainAction()); + warehouseEntity.setDeptCode(orderEntity.getDeptCode()); + warehouseEntity.setInvCode(orderEntity.getInvCode()); + codeTempService.updateByOrderId(warehouseEntity); + return ResultVOUtils.success(); + } + } diff --git a/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java index 884674bee..f44d3110d 100644 --- a/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java @@ -10,7 +10,6 @@ public class AddOrderRequest { private String action; private String fromCorp; private String fromInvCode; - private String billType; private String deptCode; private String invCode; private String billNo; diff --git a/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java b/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java index 2fab2f8c5..7c7879230 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java @@ -19,12 +19,14 @@ public interface IoCodeTempService { int updateById(IoCodeTempEntity codeEnttity); + + int updateByOrderId(IoCodeTempEntity codeTempEntity); + IoCodeTempEntity findByUnique(String orderId, String code); List findByOrderId(String billNo); TableDataInfo findByOrderId(FilterCodeRequest filterCodeRequest); - int deleteByBillNo(String orderId); } diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderService.java b/src/main/java/com/glxp/api/service/inout/IoOrderService.java index 33703b8a2..ce212bb91 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderService.java @@ -21,6 +21,8 @@ public interface IoOrderService { int update(IoOrderEntity orderEntity); + int updateByBillNo(IoOrderEntity orderEntity); + /** * 查询单据列表 * diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java index d62c5535c..0f83195e7 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java @@ -51,6 +51,11 @@ public class IoCodeTempServiceImpl implements IoCodeTempService { return ioCodeTempDao.updateById(codeEnttity); } + @Override + public int updateByOrderId(IoCodeTempEntity codeTempEntity) { + return ioCodeTempDao.update(codeTempEntity, new QueryWrapper().eq("orderId", codeTempEntity.getOrderId())); + } + @Override public IoCodeTempEntity findByUnique(String orderId, String code) { return ioCodeTempDao.selectOne(new QueryWrapper().eq("orderId", orderId).eq("code", code)); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 9fde4a726..d230b5102 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -55,6 +55,11 @@ public class IoOrderServiceImpl implements IoOrderService { return orderDao.updateById(orderEntity); } + @Override + public int updateByBillNo(IoOrderEntity orderEntity) { + return orderDao.update(orderEntity, new QueryWrapper().eq("billNo", orderEntity.getBillNo())); + } + @Override public List filterList(FilterOrderRequest filterOrderRequest) { if (null == filterOrderRequest) {