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 bc365465..7f1e8621 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -512,5 +512,12 @@ public class IoOrderController extends BaseController { return ResultVOUtils.success(); } + @PostMapping("/udiwms/inout/order/updateOrder") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) + public BaseResponse updateOrder(@RequestBody IoOrderEntity ioOrderEntity) { + orderService.updateByBillNo(ioOrderEntity); + return ResultVOUtils.success(); + } + } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 6fc1b21c..d1d32380 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -580,5 +580,32 @@ public class IoOrderDetailBizController extends BaseController { } + /** + * 查询单据业务详情列表 + * + * @param orderDetailBizRequest + * @return + */ + @GetMapping("/udiwms/inout/bizDetail/filterBizOrderList") + public BaseResponse filterBizOrderList(FilterOrderDetailBizRequest orderDetailBizRequest) { + List list = orderDetailBizService.filterList(orderDetailBizRequest); + for (IoOrderDetailBizResponse ioOrderDetailBizResponse : list) { + String msg=""; + IoOrderInvoiceEntity ioOrderInvoiceEntity=new IoOrderInvoiceEntity(); + ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailBizResponse.getOrderIdFk()); + List ioOrderInvoiceEntityList=ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceEntity); + for(IoOrderInvoiceEntity obj:ioOrderInvoiceEntityList){ + if(StrUtil.isNotEmpty(obj.getInvoiceCode())){ + msg+=","+obj.getInvoiceCode(); + } + } + if(msg.length()>1){ + msg=msg.substring(1); + } + ioOrderDetailBizResponse.setInvoiceCodes(msg); + } + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } } diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderInvoiceMapper.java b/src/main/java/com/glxp/api/dao/inout/IoOrderInvoiceMapper.java index b01220a1..971161ec 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderInvoiceMapper.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderInvoiceMapper.java @@ -5,9 +5,13 @@ import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inout.IoOrderInvoiceEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface IoOrderInvoiceMapper extends BaseMapperPlus { boolean insertInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity); + List selectOrderInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity); + } diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java index 8de2b3ae..e92852e7 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java @@ -238,4 +238,7 @@ public class IoOrderEntity { @TableField(value = "suppleCount") private Integer suppleCount; //补单次数 + @TableField(value = "checkStatus") + private Integer checkStatus; //确认状态 + } diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java index e1af5d24..54bfe00e 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java @@ -161,6 +161,8 @@ public class IoOrderDetailBizResponse { private String checkFileName; + private String invoiceCodes; + } diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderInvoiceService.java b/src/main/java/com/glxp/api/service/inout/IoOrderInvoiceService.java index c2a59306..8c3534ae 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderInvoiceService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderInvoiceService.java @@ -16,4 +16,7 @@ public interface IoOrderInvoiceService { boolean insertInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity); + List selectOrderInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity); + + } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java index 9e6a430e..c4cf3e51 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java @@ -43,4 +43,9 @@ public class IoOrderInvoiceServiceImpl implements IoOrderInvoiceService { public boolean insertInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity) { return ioOrderInvoiceMapper.insert(ioOrderInvoiceEntity) > 0; } + + @Override + public List selectOrderInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity) { + return ioOrderInvoiceMapper.selectOrderInvoice(ioOrderInvoiceEntity); + } } diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml b/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml index 267d7802..679fc017 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml @@ -13,4 +13,13 @@ ) + + diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 62ec0da4..f4080140 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -137,6 +137,8 @@ CALL Pro_Temp_ColumnWork('sys_pdf_template', 'bussinessStatus', 'varchar(255)', CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'filePath', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('io_order', 'checkStatus', 'tinyint', 1); + INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`) VALUES (100, 'clean_log_task', '0 0 2 1/1 * ? ', NULL, '删除日志数据');