维护出入库增加状态控制

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -880,6 +880,7 @@ public class IoOrderController extends BaseController {
         if (StrUtil.isBlank(billNo)) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
+        //只用于单据维护   加了状态判断了
         List<IoOrderEntity> list = orderService.filterOrderTrace(billNo);
         List<IoOrderResponse> responses = orderService.findResponse(list);
         return ResultVOUtils.success(responses);

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -754,7 +754,7 @@ public class IoOrderServiceImpl implements IoOrderService {
 
     @Override
     public List<IoOrderEntity> filterOrderTrace(String billNo) {
-        IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().eq("billNo", billNo));
+        IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().eq("billNo", billNo).in("status",5,7,10).in("dealStatus",2,3,4));
 
         if (null == order) {
             return Collections.emptyList();

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -67,11 +67,11 @@
                 AND relKey = #{relKey}
             </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and
+                AND date_format(io.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and
                         date_format(#{endTime}, '%Y-%m-%d')
             </if>
             <if test="startAduditTime != null and startAduditTime != '' and endAduditTime != null and endAduditTime != ''">
-                AND date_format(auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and
+                AND date_format(io.auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and
                         date_format(#{endAduditTime}, '%Y-%m-%d')
             </if>
             <if test="actions != null and actions.size() != 0">