自动化立体仓库 - WMS系统
luxiaotao1123
2022-03-25 6d51af4d82956e1194deb52d1427190ecbaa0a81
#杰克缝纫机立库 【根据单号检索单据数据】
6个文件已修改
1个文件已删除
322 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/MobileController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/OrderMapper.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/OrderService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/OrderDetlMapper.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/order/order0.js 294 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/MobileController.java
@@ -52,7 +52,7 @@
        if (order.getSettle() > 2) {
            return R.ok();
        }
        List<OrderDetl> orderDetls = orderService.selectWorkingDetls(orderNo);
        List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
        if (Cools.isEmpty(orderDetls)) {
            return R.ok();
        }
src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -6,10 +6,14 @@
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@Mapper
@Repository
public interface OrderDetlMapper extends BaseMapper<OrderDetl> {
    OrderDetl selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch);
    List<OrderDetl> selectWorkingDetls(Long orderId);
}
src/main/java/com/zy/asrs/mapper/OrderMapper.java
@@ -2,9 +2,12 @@
import com.zy.asrs.entity.Order;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.OrderDetl;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
import java.util.List;
@Mapper
@Repository
public interface OrderMapper extends BaseMapper<Order> {
src/main/java/com/zy/asrs/service/OrderService.java
@@ -10,6 +10,6 @@
    Order selectByNo(String orderNo);
    List<OrderDetl> selectWorkingDetls(String orderNo);
    List<OrderDetl> selectWorkingDetls(Long orderId);
}
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -3,16 +3,21 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.mapper.OrderMapper;
import com.zy.asrs.entity.Order;
import com.zy.asrs.service.OrderService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service("orderService")
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
    @Autowired
    private OrderDetlMapper orderDetlMapper;
    @Override
    public Order selectByNo(String orderNo) {
@@ -24,9 +29,8 @@
    }
    @Override
    public List<OrderDetl> selectWorkingDetls(String orderNo) {
        return null;
    public List<OrderDetl> selectWorkingDetls(Long orderId) {
        return orderDetlMapper.selectWorkingDetls(orderId);
    }
}
src/main/resources/mapper/OrderDetlMapper.xml
@@ -40,4 +40,11 @@
        </if>
    </select>
    <select id="selectWorkingDetls" resultMap="BaseResultMap">
        select * from man_order_detl
        where 1=1
        and order_id = #{orderId}
        and qty &lt; anfme
    </select>
</mapper>
src/main/webapp/static/js/order/order0.js
File was deleted