From decd9f8bf3e6119efce34e6bbc0c320a2a2446c1 Mon Sep 17 00:00:00 2001 From: guoyuji <guoyujie@ng.com> Date: 星期五, 02 二月 2024 15:41:50 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override --- north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java index 8552966..fe84513 100644 --- a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java +++ b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java @@ -3,6 +3,7 @@ import com.example.erp.entity.mm.FinishedGoodsInventory; import com.example.erp.entity.mm.FinishedOperateLog; import com.example.erp.entity.pp.FlowCard; +import com.example.erp.entity.sd.OrderDetail; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.data.repository.CrudRepository; @@ -13,5 +14,33 @@ public interface FinishedOperateLogMapper extends CrudRepository<FinishedOperateLog,Long> { FinishedOperateLog getselectFinishedOperateLog(); - Boolean insertFinishedOperateLog(FlowCard flowCard); + Boolean insertIntFinishedOperateLog(@Param("flowCard") FlowCard flowCard ,@Param("userName") String userName,@Param("oddNumber") String oddNumber); + + Boolean insertOutFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,@Param("oddNumber") String oddNumber); + + Boolean insertFinishedOperateLogAllocate(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,@Param("oddNumber") String oddNumber); + + List<OrderDetail> getselectAllocateFinishedOperateLog(@Param("offset") Integer offset, + @Param("pageSize") Integer pageSize, + @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog); + + Integer getselectAllocateFinishedOperateLogPageTotal(@Param("offset") Integer offset, + @Param("pageSize") Integer pageSize, + @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog); + + Integer getmaximum(@Param("type") String type); + + Boolean insertFinishedOperateLogTakeOut(@Param("orderDetail") OrderDetail orderDetail, + @Param("userName") String userName, + @Param("oddNumber") String oddNumber, + @Param("operateType") String operateType, + @Param("remarks") String remarks); + + List<OrderDetail> getSelectOperateRecord(@Param("offset") Integer offset, + @Param("pageSize") Integer pageSize, + @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog); + + Integer getSelectOperateRecordLogPageTotal(@Param("offset") Integer offset, + @Param("pageSize") Integer pageSize, + @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog); } -- Gitblit v1.8.0